summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Schulz <alex@shark-linux.de>2009-01-08 18:05:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-19 12:30:20 +0100
commiteab184c2362567f2b2e951b7bd0e0d353a7e5091 (patch)
treef03f859d1f038b1c0b358c35fb842fc2f50f41d7 /drivers
parent[ARM] 5377/1: S3C2410-Framebuffer: Fix resume path in S3C2410 framebuffer dri... (diff)
downloadlinux-eab184c2362567f2b2e951b7bd0e0d353a7e5091.tar.xz
linux-eab184c2362567f2b2e951b7bd0e0d353a7e5091.zip
[ARM] 5363/1: Shark cleanup and new defconfig
This includes a new defconfig for the Shark and some changes to the mach-shark directory to avoid namespace pollution and to switch the rtc to the newer driver. Signed-off-by: Alexander Schulz <alex@shark-linux.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/cyber2000fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 7a9e42e3a9a9..51b373657aa2 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1425,7 +1425,7 @@ static void cyberpro_common_resume(struct cfb_info *cfb)
#ifdef CONFIG_ARCH_SHARK
-#include <mach/hardware.h>
+#include <mach/framebuffer.h>
static int __devinit cyberpro_vl_probe(void)
{