[PATCH 3/3] uvesafb: remove-ifdef-CONFIG_X86-around-ioremap

Thomas Schlichter
2011-02-06T11:16:02Z

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]

[-- Attachment #2: 0003-uvesafb-remove-ifdef-CONFIG_X86-around-ioremap.patch --]
[-- Type: text/x-patch, Size: 1309 bytes --]

>From d1e432f878746b699856160456f811affc3c42fe Mon Sep 17 00:00:00 2001
From: Thomas Schlichter <thomas.schlichter@web.de>
Date: Sun, 6 Feb 2011 11:45:08 +0100
Subject: [PATCH 3/3] uvesafb: remove ifdef CONFIG_X86 around ioremap in

Now that ioremap_cache() and ioremap_wc() are available on each architecture
we can remove the unneccessary ifdef in uvesafb.

Signed-off-by: Thomas Schlichter <thomas.schlichter@web.de>
---
drivers/video/uvesafb.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 2d6f799..ca15166 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -1567,7 +1567,6 @@ static void __devinit uvesafb_init_mtrr(struct fb_info *info)

static void __devinit uvesafb_ioremap(struct fb_info *info)
{
-#ifdef CONFIG_X86
switch (mtrr) {
case 1: /* uncachable */
info->screen_base = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);
@@ -1583,9 +1582,6 @@ static void __devinit uvesafb_ioremap(struct fb_info *info)
info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
break;
}
-#else
- info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
-#endif /* CONFIG_X86 */
}

static ssize_t uvesafb_show_vbe_ver(struct device *dev,
--
1.7.1