From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Oct 2008 02:39:55 +0000 (+1100)
Subject: PCI: don't export linux/io.h from pci.h
X-Git-Tag: v2.6.28-rc1~29^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1388cc964e680c1086ca0edae35be094cb29d51e;p=linux-2.6-omap-h63xx.git

PCI: don't export linux/io.h from pci.h

Move the include of io.h down into the #ifdef __KERNEL__ protected
region.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 955ab705c05..752def8a2ef 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -18,7 +18,6 @@
 #define LINUX_PCI_H
 
 #include <linux/pci_regs.h>	/* The pci register defines */
-#include <linux/io.h>
 
 /*
  * The PCI interface treats multi-function devices as independent
@@ -52,6 +51,7 @@
 #include <linux/kobject.h>
 #include <asm/atomic.h>
 #include <linux/device.h>
+#include <linux/io.h>
 
 /* Include the ID list */
 #include <linux/pci_ids.h>