aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/include/mach/clkdev.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-01-16 16:27:28 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-02 09:35:29 +0100
commit39c0cb02db5b8fdfac76d506b7a008b70bc960e9 (patch)
tree30e79dcadb5f6c26bba5fcf585cc309e240ff948 /arch/arm/mach-integrator/include/mach/clkdev.h
parentb830b9b5b3d04bc22f0b9ded85b713f7d3c11b7f (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/mach/clkdev.h')
-rw-r--r--arch/arm/mach-integrator/include/mach/clkdev.h6
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 @@
#define __ASM_MACH_CLKDEV_H
#include <linux/module.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
struct clk {
unsigned long rate;
struct module *owner;
- const struct icst525_params *params;
+ const struct icst_params *params;
void *data;
- void (*setvco)(struct clk *, struct icst525_vco vco);
+ void (*setvco)(struct clk *, struct icst_vco vco);
};
static inline int __clk_get(struct clk *clk)