projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-s3c2440
/
s3c2442.c
diff --git
a/arch/arm/mach-s3c2440/s3c2442.c
b/arch/arm/mach-s3c2440/s3c2442.c
index 8004e0497bf4e262cc52cf903b0bf49fcb026f9b..22cb7c94a8c8880d81b987f132acca9b39352bef 100644
(file)
--- a/
arch/arm/mach-s3c2440/s3c2442.c
+++ b/
arch/arm/mach-s3c2440/s3c2442.c
@@
-122,7
+122,7
@@
static struct clk s3c2442_clk_cam_upll = {
},
};
-static int s3c2442_clk_add(struct device *dev)
+static int s3c2442_clk_add(struct device *dev
, struct subsys_interface *sif
)
{
struct clk *clock_upll;
struct clk *clock_h;