diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 11:15:52 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 11:15:52 -0500 |
commit | f8ce25476d5f12ffa29b885e49c38cd95053437e (patch) | |
tree | 640fbdaacbf375f13feaf0eee49306d90b778b8a /drivers/video | |
parent | de1d815fccee1f4766a7e56054ab0ec3f6f3a7db (diff) |
[ARM] Move asm/hardware/clock.h to linux/clk.h
This is needs to be visible to other architectures using the AMBA
bus and peripherals.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/amba-clcd.c | 2 | ||||
-rw-r--r-- | drivers/video/s3c2410fb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 3358a1429651..0da4083ba908 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <linux/list.h> | 23 | #include <linux/list.h> |
24 | #include <linux/amba/bus.h> | 24 | #include <linux/amba/bus.h> |
25 | #include <linux/amba/clcd.h> | 25 | #include <linux/amba/clcd.h> |
26 | #include <linux/clk.h> | ||
26 | 27 | ||
27 | #include <asm/sizes.h> | 28 | #include <asm/sizes.h> |
28 | #include <asm/hardware/clock.h> | ||
29 | 29 | ||
30 | #define to_clcd(info) container_of(info, struct clcd_fb, fb) | 30 | #define to_clcd(info) container_of(info, struct clcd_fb, fb) |
31 | 31 | ||
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index d9c08cc7ac44..fe99d17a21d7 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -87,6 +87,7 @@ | |||
87 | #include <linux/workqueue.h> | 87 | #include <linux/workqueue.h> |
88 | #include <linux/wait.h> | 88 | #include <linux/wait.h> |
89 | #include <linux/platform_device.h> | 89 | #include <linux/platform_device.h> |
90 | #include <linux/clk.h> | ||
90 | 91 | ||
91 | #include <asm/io.h> | 92 | #include <asm/io.h> |
92 | #include <asm/uaccess.h> | 93 | #include <asm/uaccess.h> |
@@ -96,7 +97,6 @@ | |||
96 | #include <asm/arch/regs-lcd.h> | 97 | #include <asm/arch/regs-lcd.h> |
97 | #include <asm/arch/regs-gpio.h> | 98 | #include <asm/arch/regs-gpio.h> |
98 | #include <asm/arch/fb.h> | 99 | #include <asm/arch/fb.h> |
99 | #include <asm/hardware/clock.h> | ||
100 | 100 | ||
101 | #ifdef CONFIG_PM | 101 | #ifdef CONFIG_PM |
102 | #include <linux/pm.h> | 102 | #include <linux/pm.h> |