diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 11:27:28 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 04:35:29 -0400 |
commit | 39c0cb02db5b8fdfac76d506b7a008b70bc960e9 (patch) | |
tree | 30e79dcadb5f6c26bba5fcf585cc309e240ff948 /arch/arm/mach-integrator/include | |
parent | b830b9b5b3d04bc22f0b9ded85b713f7d3c11b7f (diff) |
ARM: ICST: merge common ICST VCO structures
The structures for the ICST307 and ICST525 VCO devices are
identical, so merge them together.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/include')
-rw-r--r-- | arch/arm/mach-integrator/include/mach/clkdev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/include/mach/clkdev.h b/arch/arm/mach-integrator/include/mach/clkdev.h index 9293e410832..89ea9380399 100644 --- a/arch/arm/mach-integrator/include/mach/clkdev.h +++ b/arch/arm/mach-integrator/include/mach/clkdev.h | |||
@@ -2,14 +2,14 @@ | |||
2 | #define __ASM_MACH_CLKDEV_H | 2 | #define __ASM_MACH_CLKDEV_H |
3 | 3 | ||
4 | #include <linux/module.h> | 4 | #include <linux/module.h> |
5 | #include <asm/hardware/icst525.h> | 5 | #include <asm/hardware/icst.h> |
6 | 6 | ||
7 | struct clk { | 7 | struct clk { |
8 | unsigned long rate; | 8 | unsigned long rate; |
9 | struct module *owner; | 9 | struct module *owner; |
10 | const struct icst525_params *params; | 10 | const struct icst_params *params; |
11 | void *data; | 11 | void *data; |
12 | void (*setvco)(struct clk *, struct icst525_vco vco); | 12 | void (*setvco)(struct clk *, struct icst_vco vco); |
13 | }; | 13 | }; |
14 | 14 | ||
15 | static inline int __clk_get(struct clk *clk) | 15 | static inline int __clk_get(struct clk *clk) |