[PATCH] <linux/pci.h> needs <linux/io.h> for ioremap_nocache()

From: Geert Uytterhoeven
Date: Wed Oct 22 2008 - 02:50:35 EST

commit aa42d7c6138afdc54f74e971456a0fbfec16b77b ("PCI: introduce an
pci_ioremap(pdev, barnr) function") added a static inline function that calls
ioremap_nocache(), causing a compile error on m68k:

| In file included from drivers/ide/ide.c:58:
| include/linux/pci.h: In function 'pci_ioremap_bar':
| include/linux/pci.h:1132: error: implicit declaration of function 'ioremap_nocache'
| include/linux/pci.h:1133: warning: return makes pointer from integer without a cast
| In file included from include/linux/bio.h:30,
| from include/linux/blkdev.h:17,
| from include/linux/ide.h:13,
| from drivers/ide/ide.c:59:

Include <linux/io.h> to provide the prototype for ioremap_nocache().

Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Discovered in the linux-next builds on Oct 21, which was actually the one of
Oct 20 (Ozlabs time)
Discovered in the mainline builds two day later

include/linux/pci.h | 1 +
1 file changed, 1 insertion(+)

--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -44,6 +44,7 @@

#include <linux/types.h>
#include <linux/init.h>
+#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/list.h>
#include <linux/compiler.h>



Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/