[PATCH] include io.h in pci.h to avoid pci_ioremap build errors

[PATCH] include io.h in pci.h to avoid pci_ioremap build errors

[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.

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 085187b..3e2f1d3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -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

Re: [PATCH] include io.h in pci.h to avoid pci_ioremap build errors

[Jesse Barnes]

On Tuesday, October 21, 2008 10:07 am Jesse Barnes wrote:
> 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.
>
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 085187b..3e2f1d3 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -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!).

-- 
Jesse Barnes, Intel Open Source Technology Center