From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Schlichter Date: Sun, 06 Feb 2011 11:14:56 +0000 Subject: [PATCH 3/3] uvesafb: remove-ifdef-CONFIG_X86-around-ioremap Message-Id: <201102061214.56729.thomas.schlichter@web.de> MIME-Version: 1 Content-Type: multipart/mixed; boundary="Boundary-00=_wKoTNRL8bPvdXel" List-Id: References: <201011271437.38126.thomas.schlichter@web.de> <20101130061051.GD17114@linux-sh.org> <201102061202.09503.thomas.schlichter@web.de> In-Reply-To: <201102061202.09503.thomas.schlichter@web.de> To: Paul Mundt Cc: Michal Januszewski , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org --Boundary-00=_wKoTNRL8bPvdXel Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit --Boundary-00=_wKoTNRL8bPvdXel Content-Type: text/x-patch; charset="iso-8859-15"; name="0003-uvesafb-remove-ifdef-CONFIG_X86-around-ioremap.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0003-uvesafb-remove-ifdef-CONFIG_X86-around-ioremap.patch" >From d1e432f878746b699856160456f811affc3c42fe Mon Sep 17 00:00:00 2001 From: Thomas Schlichter 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 --- 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 --Boundary-00=_wKoTNRL8bPvdXel--