diff options
author | Alexander Schulz <alex@shark-linux.de> | 2009-01-08 12:05:58 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-19 06:30:20 -0500 |
commit | eab184c2362567f2b2e951b7bd0e0d353a7e5091 (patch) | |
tree | f03f859d1f038b1c0b358c35fb842fc2f50f41d7 /drivers/video/cyber2000fb.c | |
parent | 60f793de891ea06fa870546336a88df543ec56ae (diff) |
[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/video/cyber2000fb.c')
-rw-r--r-- | drivers/video/cyber2000fb.c | 2 |
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) | |||
1425 | 1425 | ||
1426 | #ifdef CONFIG_ARCH_SHARK | 1426 | #ifdef CONFIG_ARCH_SHARK |
1427 | 1427 | ||
1428 | #include <mach/hardware.h> | 1428 | #include <mach/framebuffer.h> |
1429 | 1429 | ||
1430 | static int __devinit cyberpro_vl_probe(void) | 1430 | static int __devinit cyberpro_vl_probe(void) |
1431 | { | 1431 | { |