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/char | |
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/char')
-rw-r--r-- | drivers/char/s3c2410-rtc.c | 2 | ||||
-rw-r--r-- | drivers/char/watchdog/s3c2410_wdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c index 3df7a574267b..2e308657f6f6 100644 --- a/drivers/char/s3c2410-rtc.c +++ b/drivers/char/s3c2410-rtc.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/rtc.h> | 25 | #include <linux/rtc.h> |
26 | #include <linux/bcd.h> | 26 | #include <linux/bcd.h> |
27 | #include <linux/clk.h> | ||
27 | 28 | ||
28 | #include <asm/hardware.h> | 29 | #include <asm/hardware.h> |
29 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
@@ -33,7 +34,6 @@ | |||
33 | 34 | ||
34 | #include <asm/mach/time.h> | 35 | #include <asm/mach/time.h> |
35 | 36 | ||
36 | #include <asm/hardware/clock.h> | ||
37 | #include <asm/arch/regs-rtc.h> | 37 | #include <asm/arch/regs-rtc.h> |
38 | 38 | ||
39 | /* need this for the RTC_AF definitions */ | 39 | /* need this for the RTC_AF definitions */ |
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index 621e8a99e733..9dc54736e4eb 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c | |||
@@ -46,12 +46,12 @@ | |||
46 | #include <linux/init.h> | 46 | #include <linux/init.h> |
47 | #include <linux/platform_device.h> | 47 | #include <linux/platform_device.h> |
48 | #include <linux/interrupt.h> | 48 | #include <linux/interrupt.h> |
49 | #include <linux/clk.h> | ||
49 | 50 | ||
50 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
51 | #include <asm/io.h> | 52 | #include <asm/io.h> |
52 | 53 | ||
53 | #include <asm/arch/map.h> | 54 | #include <asm/arch/map.h> |
54 | #include <asm/hardware/clock.h> | ||
55 | 55 | ||
56 | #undef S3C24XX_VA_WATCHDOG | 56 | #undef S3C24XX_VA_WATCHDOG |
57 | #define S3C24XX_VA_WATCHDOG (0) | 57 | #define S3C24XX_VA_WATCHDOG (0) |