diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock2430.c')
-rw-r--r-- | arch/arm/mach-omap2/clock2430.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/clock2430.c b/arch/arm/mach-omap2/clock2430.c index 7a61d7842968..cef0c8d1de52 100644 --- a/arch/arm/mach-omap2/clock2430.c +++ b/arch/arm/mach-omap2/clock2430.c | |||
@@ -40,11 +40,7 @@ | |||
40 | * passes back the correct CM_IDLEST register address for I2CHS | 40 | * passes back the correct CM_IDLEST register address for I2CHS |
41 | * modules. No return value. | 41 | * modules. No return value. |
42 | */ | 42 | */ |
43 | #ifdef CONFIG_COMMON_CLK | ||
44 | static void omap2430_clk_i2chs_find_idlest(struct clk_hw_omap *clk, | 43 | static void omap2430_clk_i2chs_find_idlest(struct clk_hw_omap *clk, |
45 | #else | ||
46 | static void omap2430_clk_i2chs_find_idlest(struct clk *clk, | ||
47 | #endif | ||
48 | void __iomem **idlest_reg, | 44 | void __iomem **idlest_reg, |
49 | u8 *idlest_bit, | 45 | u8 *idlest_bit, |
50 | u8 *idlest_val) | 46 | u8 *idlest_val) |
@@ -55,16 +51,7 @@ static void omap2430_clk_i2chs_find_idlest(struct clk *clk, | |||
55 | } | 51 | } |
56 | 52 | ||
57 | /* 2430 I2CHS has non-standard IDLEST register */ | 53 | /* 2430 I2CHS has non-standard IDLEST register */ |
58 | #ifdef CONFIG_COMMON_CLK | ||
59 | const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait = { | 54 | const struct clk_hw_omap_ops clkhwops_omap2430_i2chs_wait = { |
60 | .find_idlest = omap2430_clk_i2chs_find_idlest, | 55 | .find_idlest = omap2430_clk_i2chs_find_idlest, |
61 | .find_companion = omap2_clk_dflt_find_companion, | 56 | .find_companion = omap2_clk_dflt_find_companion, |
62 | }; | 57 | }; |
63 | #else | ||
64 | const struct clkops clkops_omap2430_i2chs_wait = { | ||
65 | .enable = omap2_dflt_clk_enable, | ||
66 | .disable = omap2_dflt_clk_disable, | ||
67 | .find_idlest = omap2430_clk_i2chs_find_idlest, | ||
68 | .find_companion = omap2_clk_dflt_find_companion, | ||
69 | }; | ||
70 | #endif | ||