From patchwork Sun Feb 6 11:14:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schlichter X-Patchwork-Id: 534711 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p16BG7jg001675 for ; Sun, 6 Feb 2011 11:16:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334Ab1BFLQA (ORCPT ); Sun, 6 Feb 2011 06:16:00 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:33211 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273Ab1BFLP7 (ORCPT ); Sun, 6 Feb 2011 06:15:59 -0500 Received: from smtp05.web.de ( [172.20.4.166]) by fmmailgate02.web.de (Postfix) with ESMTP id 1E2001966E3B6; Sun, 6 Feb 2011 12:15:36 +0100 (CET) Received: from [92.194.83.242] (helo=netbook.localnet) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1Pm2ad-0005Zp-02; Sun, 06 Feb 2011 12:15:36 +0100 From: Thomas Schlichter To: Paul Mundt Subject: [PATCH 3/3] uvesafb: remove-ifdef-CONFIG_X86-around-ioremap Date: Sun, 6 Feb 2011 12:14:56 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.35-25-generic-pae; KDE/4.5.5; i686; ; ) Cc: Michal Januszewski , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org 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> MIME-Version: 1.0 Message-Id: <201102061214.56729.thomas.schlichter@web.de> X-Sender: thomas.schlichter@web.de X-Provags-ID: V01U2FsdGVkX1+rn4GilIssFF18ORSagKdeTLCalXMVt8/SSJXO 3rl2YwjsRB8GgQdl89LHNZzeFUjCsfC6CCF2+C/GWTM4z1q7QS kNG142iT4PZwblBKpv7g== Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 06 Feb 2011 11:16:23 +0000 (UTC) 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