diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:34:00 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:34:00 +0200 |
commit | 1e09939bad24df95ddeeeca4fbec64fa94b66def (patch) | |
tree | 8a4661ed8c4619db28863353858e0171171b7d8a /arch/arm/plat-s3c24xx/clock-dclk.c | |
parent | Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel'... (diff) | |
parent | ARM: S5P64X0: External Interrupt Support (diff) | |
download | linux-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/plat-s3c24xx/clock-dclk.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/clock-dclk.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/plat-s3c24xx/clock-dclk.c b/arch/arm/plat-s3c24xx/clock-dclk.c index cf97caafe56b..f95d3268ae1f 100644 --- a/arch/arm/plat-s3c24xx/clock-dclk.c +++ b/arch/arm/plat-s3c24xx/clock-dclk.c @@ -169,7 +169,6 @@ static struct clk_ops dclk_ops = { struct clk s3c24xx_dclk0 = { .name = "dclk0", - .id = -1, .ctrlbit = S3C2410_DCLKCON_DCLK0EN, .enable = s3c24xx_dclk_enable, .ops = &dclk_ops, @@ -177,7 +176,6 @@ struct clk s3c24xx_dclk0 = { struct clk s3c24xx_dclk1 = { .name = "dclk1", - .id = -1, .ctrlbit = S3C2410_DCLKCON_DCLK1EN, .enable = s3c24xx_dclk_enable, .ops = &dclk_ops, @@ -189,12 +187,10 @@ static struct clk_ops clkout_ops = { struct clk s3c24xx_clkout0 = { .name = "clkout0", - .id = -1, .ops = &clkout_ops, }; struct clk s3c24xx_clkout1 = { .name = "clkout1", - .id = -1, .ops = &clkout_ops, }; |