diff options
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/epson1355fb.c | 16 |
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 | ||
813 | config FB_EPSON1355 | 813 | config 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 | |||
73 | static inline u8 epson1355_read_reg(int index) | ||
74 | { | ||
75 | return ctrl_inb(par.reg_addr + index); | ||
76 | } | ||
77 | |||
78 | static 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); |