summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440/clock.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-21 16:34:00 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-21 16:34:00 +0200
commit1e09939bad24df95ddeeeca4fbec64fa94b66def (patch)
tree8a4661ed8c4619db28863353858e0171171b7d8a /arch/arm/mach-s3c2440/clock.c
parentMerge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel'... (diff)
parentARM: S5P64X0: External Interrupt Support (diff)
downloadlinux-1e09939bad24df95ddeeeca4fbec64fa94b66def.tar.xz
linux-1e09939bad24df95ddeeeca4fbec64fa94b66def.zip
Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel
Diffstat (limited to 'arch/arm/mach-s3c2440/clock.c')
-rw-r--r--arch/arm/mach-s3c2440/clock.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c
index 3dc2426e2345..554e0d3ec70b 100644
--- a/arch/arm/mach-s3c2440/clock.c
+++ b/arch/arm/mach-s3c2440/clock.c
@@ -90,14 +90,12 @@ static int s3c2440_camif_upll_setrate(struct clk *clk, unsigned long rate)
static struct clk s3c2440_clk_cam = {
.name = "camif",
- .id = -1,
.enable = s3c2410_clkcon_enable,
.ctrlbit = S3C2440_CLKCON_CAMERA,
};
static struct clk s3c2440_clk_cam_upll = {
.name = "camif-upll",
- .id = -1,
.ops = &(struct clk_ops) {
.set_rate = s3c2440_camif_upll_setrate,
.round_rate = s3c2440_camif_upll_round,
@@ -106,7 +104,6 @@ static struct clk s3c2440_clk_cam_upll = {
static struct clk s3c2440_clk_ac97 = {
.name = "ac97",
- .id = -1,
.enable = s3c2410_clkcon_enable,
.ctrlbit = S3C2440_CLKCON_CAMERA,
};