From e287647d0af318151358d04c9c42f28e9fec72b4 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 17 Jul 2007 04:05:48 -0700 Subject: [PATCH] --- yaml --- r: 60922 b: refs/heads/master c: 1a3f28817e2a3f0be67ec8afa0cfd779adb5d41d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/Kconfig | 2 +- trunk/drivers/video/epson1355fb.c | 16 ++-------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 5c1045055461..e74e60b01aff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84650346b20c8f8af35e3773506102ff1680e887 +refs/heads/master: 1a3f28817e2a3f0be67ec8afa0cfd779adb5d41d diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 9b7a76be36a0..8365feb42289 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/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/trunk/drivers/video/epson1355fb.c b/trunk/drivers/video/epson1355fb.c index 67f58bae384d..33be46ccb54f 100644 --- a/trunk/drivers/video/epson1355fb.c +++ b/trunk/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 @@ -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);