summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-17 04:05:48 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 10:23:13 -0700
commit1a3f28817e2a3f0be67ec8afa0cfd779adb5d41d (patch)
tree2e519ed62c5738016f6d370c992fef78942836bc /drivers/video
parent84650346b20c8f8af35e3773506102ff1680e887 (diff)
fb: epson1355fb: kill off dead sh support
The SH board that was the only user for this code was removed entirely from the kernel quite some time ago, so there's no reason to leave the stubs in place. Additionally this driver was completely broken anyways, so there's not really a lot of point in fixing it up either. I can't imagine that this driver gets any testing on ARM either, given that FB_BLANK_UNBLANKING doesn't exist, and kills the build regardless of which platform is compiling. This fixes that, too. It wouldn't be a lot of work to finish the platform device conversion and go with a generic 8-bit read/write_reg and kill off the architecture dependence completely, should someone have any use for this driver. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig2
-rw-r--r--drivers/video/epson1355fb.c16
2 files changed, 3 insertions, 15 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 9b7a76be36a0..8365feb42289 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -812,7 +812,7 @@ config FB_PVR2
config FB_EPSON1355
bool "Epson 1355 framebuffer support"
- depends on (FB = y) && (SUPERH || ARCH_CEIVA)
+ depends on (FB = y) && ARCH_CEIVA
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 67f58bae384d..33be46ccb54f 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -68,19 +68,7 @@ struct epson1355_par {
/* ------------------------------------------------------------------------- */
-#ifdef CONFIG_SUPERH
-
-static inline u8 epson1355_read_reg(int index)
-{
- return ctrl_inb(par.reg_addr + index);
-}
-
-static inline void epson1355_write_reg(u8 data, int index)
-{
- ctrl_outb(data, par.reg_addr + index);
-}
-
-#elif defined(CONFIG_ARM)
+#if defined(CONFIG_ARM)
# ifdef CONFIG_ARCH_CEIVA
# include <asm/arch/hardware.h>
@@ -290,7 +278,7 @@ static int epson1355fb_blank(int blank_mode, struct fb_info *info)
struct epson1355_par *par = info->par;
switch (blank_mode) {
- case FB_BLANK_UNBLANKING:
+ case FB_BLANK_UNBLANK:
case FB_BLANK_NORMAL:
lcd_enable(par, 1);
backlight_enable(1);