From patchwork Mon Mar 22 22:09:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 87520 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2MMA4oC006497 for ; Mon, 22 Mar 2010 22:10:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755143Ab0CVWKD (ORCPT ); Mon, 22 Mar 2010 18:10:03 -0400 Received: from 124x34x33x190.ap124.ftth.ucom.ne.jp ([124.34.33.190]:34398 "EHLO master.linux-sh.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755013Ab0CVWKC (ORCPT ); Mon, 22 Mar 2010 18:10:02 -0400 Received: from localhost (unknown [127.0.0.1]) by master.linux-sh.org (Postfix) with ESMTP id 75C9963777; Mon, 22 Mar 2010 22:08:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at linux-sh.org Received: from master.linux-sh.org ([127.0.0.1]) by localhost (master.linux-sh.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hzCwgR8TcExX; Tue, 23 Mar 2010 07:08:53 +0900 (JST) Received: from localhost (cpc5-brad6-0-0-cust25.barn.cable.virginmedia.com [82.38.64.26]) by master.linux-sh.org (Postfix) with ESMTP id 8F57463773; Tue, 23 Mar 2010 07:08:52 +0900 (JST) From: Matt Fleming To: linux-sh@vger.kernel.org Cc: Paul Mundt Subject: [PATCH] sh: Fix build after dynamic PMB rework Date: Mon, 22 Mar 2010 22:09:58 +0000 Message-Id: <1269295798-5215-1-git-send-email-matt@console-pimps.org> X-Mailer: git-send-email 1.6.4.rc0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 22 Mar 2010 22:10:04 +0000 (UTC) diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c index a4662e2..dda628e 100644 --- a/arch/sh/mm/pmb.c +++ b/arch/sh/mm/pmb.c @@ -323,6 +323,7 @@ static void __clear_pmb_entry(struct pmb_entry *pmbe) writel_uncached(data_val & ~PMB_V, data); } +#ifdef CONFIG_PM static void set_pmb_entry(struct pmb_entry *pmbe) { unsigned long flags; @@ -331,6 +332,7 @@ static void set_pmb_entry(struct pmb_entry *pmbe) __set_pmb_entry(pmbe); spin_unlock_irqrestore(&pmbe->lock, flags); } +#endif /* CONFIG_PM */ int pmb_bolt_mapping(unsigned long vaddr, phys_addr_t phys, unsigned long size, pgprot_t prot)