aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-17 07:05:48 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:13 -0400
commit1a3f28817e2a3f0be67ec8afa0cfd779adb5d41d (patch)
tree2e519ed62c5738016f6d370c992fef78942836bc
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>
-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
812 812
813config FB_EPSON1355 813config FB_EPSON1355
814 bool "Epson 1355 framebuffer support" 814 bool "Epson 1355 framebuffer support"
815 depends on (FB = y) && (SUPERH || ARCH_CEIVA) 815 depends on (FB = y) && ARCH_CEIVA
816 select FB_CFB_FILLRECT 816 select FB_CFB_FILLRECT
817 select FB_CFB_COPYAREA 817 select FB_CFB_COPYAREA
818 select FB_CFB_IMAGEBLIT 818 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 {
68 68
69/* ------------------------------------------------------------------------- */ 69/* ------------------------------------------------------------------------- */
70 70
71#ifdef CONFIG_SUPERH 71#if defined(CONFIG_ARM)
72
73static inline u8 epson1355_read_reg(int index)
74{
75 return ctrl_inb(par.reg_addr + index);
76}
77
78static inline void epson1355_write_reg(u8 data, int index)
79{
80 ctrl_outb(data, par.reg_addr + index);
81}
82
83#elif defined(CONFIG_ARM)
84 72
85# ifdef CONFIG_ARCH_CEIVA 73# ifdef CONFIG_ARCH_CEIVA
86# include <asm/arch/hardware.h> 74# include <asm/arch/hardware.h>
@@ -290,7 +278,7 @@ static int epson1355fb_blank(int blank_mode, struct fb_info *info)
290 struct epson1355_par *par = info->par; 278 struct epson1355_par *par = info->par;
291 279
292 switch (blank_mode) { 280 switch (blank_mode) {
293 case FB_BLANK_UNBLANKING: 281 case FB_BLANK_UNBLANK:
294 case FB_BLANK_NORMAL: 282 case FB_BLANK_NORMAL:
295 lcd_enable(par, 1); 283 lcd_enable(par, 1);
296 backlight_enable(1); 284 backlight_enable(1);