summaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-10-22 13:39:55 +1100
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-22 16:42:46 -0700
commit1388cc964e680c1086ca0edae35be094cb29d51e (patch)
tree35714ec0e3b0e33cb00205b0315337f843a63b90 /include/linux/pci.h
parent61cfc7e442c52c14e632d9af0e70779cfa04249d (diff)
downloadlinux-1388cc964e680c1086ca0edae35be094cb29d51e.tar.gz
linux-1388cc964e680c1086ca0edae35be094cb29d51e.tar.bz2
linux-1388cc964e680c1086ca0edae35be094cb29d51e.zip
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>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 955ab705c05e..752def8a2ef4 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>