Skip to contentSkip to conversation

include io.h in pci.h to avoid pci_ioremap build errors

PATCH In review Jesse Barnes 1 participant 2 messages Oct 21, 2008 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 include io.h in pci.h to avoid pci_ioremap build errors

Ingo pointed out that the m32r build was broken by pci_ioremap. It looks like some files include pci.h w/o including io.h. The latter defines ioremap_* if present, so it makes sense to include it in pci.h now that we have pci_ioremap there.

I'll queue this up in my tree for the next pull request, but affected users can apply this patch in the meantime.

include/linux/pci.h +1 -0
index 085187b..3e2f1d3 100644
@@ -18,6 +18,7 @@
 #define LINUX_PCI_H
 
 #include <linux/pci_regs.h>	/* The pci register defines */
+#include <asm/io.h>
 
 /*
  * The PCI interface treats multi-function devices as independent
#1 lore raw
Quoted 13 lines · Jesse Barnes

Ingo pointed out that the m32r build was broken by pci_ioremap. It looks like some files include pci.h w/o including io.h. The latter defines ioremap_* if present, so it makes sense to include it in pci.h now that we have pci_ioremap there.

I'll queue this up in my tree for the next pull request, but affected users can apply this patch in the meantime.

include/linux/pci.h +0 -0
index 085187b..3e2f1d3 100644

include/linux/pci.h line 24

Quoted 7 lines
include/linux/pci.h +1 -0
@@ -18,6 +18,7 @@
 #define LINUX_PCI_H
 
 #include <linux/pci_regs.h>	/* The pci register defines */
+#include <asm/io.h>
 
 /*
  * The PCI interface treats multi-function devices as independent

The fix I applied to my tree uses linux/io.h instead, which is probably more correct (thanks David!).

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center