From: Rolf Eike Beer <eike@sf-mail.de>
To: linux-parisc List <linux-parisc@vger.kernel.org>
Subject: [PATCH 1/2] parisc: fix compile without CONFIG_PCI
Date: Mon, 16 Jan 2012 20:13:20 +0100 [thread overview]
Message-ID: <4000012.xgVA85Qcpi@eto> (raw)
In-Reply-To: <6637509.yTD8q5zPsI@eto>
>From f49bd6e33a3b6f499a6039a5980af21893524e86 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike-kernel@sf-tec.de>
Date: Mon, 16 Jan 2012 18:59:29 +0100
Subject: [PATCH 1/2] parisc: fix compile without CONFIG_PCI
This function is already defined as a noop in include/asm-generic/iomap.h.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
arch/parisc/lib/iomap.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
index fb8e10a..b2b0408 100644
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
@@ -436,12 +436,14 @@ void ioport_unmap(void __iomem *addr)
}
}
+#ifdef CONFIG_PCI
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
{
if (!INDIRECT_ADDR(addr)) {
iounmap(addr);
}
}
+#endif /* CONFIG_PCI */
EXPORT_SYMBOL(ioread8);
EXPORT_SYMBOL(ioread16);
@@ -461,4 +463,6 @@ EXPORT_SYMBOL(iowrite16_rep);
EXPORT_SYMBOL(iowrite32_rep);
EXPORT_SYMBOL(ioport_map);
EXPORT_SYMBOL(ioport_unmap);
+#ifdef CONFIG_PCI
EXPORT_SYMBOL(pci_iounmap);
+#endif /* CONFIG_PCI */
--
1.7.7
next prev parent reply other threads:[~2012-01-16 19:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-16 19:12 [PATCH 0/2] Random PARISC patches Rolf Eike Beer
2012-01-16 19:13 ` Rolf Eike Beer [this message]
2012-01-30 10:13 ` [PATCH 1/2] parisc: fix compile without CONFIG_PCI Rolf Eike Beer
2012-01-16 19:13 ` [PATCH 2/2] HIL: remove one goto Rolf Eike Beer
2012-01-16 19:38 ` John David Anglin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4000012.xgVA85Qcpi@eto \
--to=eike@sf-mail.de \
--cc=linux-parisc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).