summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-07 16:15:52 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-07 16:15:52 +0000
commitf8ce25476d5f12ffa29b885e49c38cd95053437e (patch)
tree640fbdaacbf375f13feaf0eee49306d90b778b8a /drivers/video
parentde1d815fccee1f4766a7e56054ab0ec3f6f3a7db (diff)
downloadlinux-f8ce25476d5f12ffa29b885e49c38cd95053437e.tar.gz
linux-f8ce25476d5f12ffa29b885e49c38cd95053437e.tar.bz2
linux-f8ce25476d5f12ffa29b885e49c38cd95053437e.zip
[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.c2
-rw-r--r--drivers/video/s3c2410fb.c2
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 @@
#include <linux/list.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
+#include <linux/clk.h>
#include <asm/sizes.h>
-#include <asm/hardware/clock.h>
#define to_clcd(info) container_of(info, struct clcd_fb, fb)
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 @@
#include <linux/workqueue.h>
#include <linux/wait.h>
#include <linux/platform_device.h>
+#include <linux/clk.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -96,7 +97,6 @@
#include <asm/arch/regs-lcd.h>
#include <asm/arch/regs-gpio.h>
#include <asm/arch/fb.h>
-#include <asm/hardware/clock.h>
#ifdef CONFIG_PM
#include <linux/pm.h>