diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-21 22:39:55 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-22 19:42:46 -0400 |
| commit | 1388cc964e680c1086ca0edae35be094cb29d51e (patch) | |
| tree | 35714ec0e3b0e33cb00205b0315337f843a63b90 /include/linux/pci.h | |
| parent | 61cfc7e442c52c14e632d9af0e70779cfa04249d (diff) | |
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.h | 2 |
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 @@ | |||
| 18 | #define LINUX_PCI_H | 18 | #define LINUX_PCI_H |
| 19 | 19 | ||
| 20 | #include <linux/pci_regs.h> /* The pci register defines */ | 20 | #include <linux/pci_regs.h> /* The pci register defines */ |
| 21 | #include <linux/io.h> | ||
| 22 | 21 | ||
| 23 | /* | 22 | /* |
| 24 | * The PCI interface treats multi-function devices as independent | 23 | * The PCI interface treats multi-function devices as independent |
| @@ -52,6 +51,7 @@ | |||
| 52 | #include <linux/kobject.h> | 51 | #include <linux/kobject.h> |
| 53 | #include <asm/atomic.h> | 52 | #include <asm/atomic.h> |
| 54 | #include <linux/device.h> | 53 | #include <linux/device.h> |
| 54 | #include <linux/io.h> | ||
| 55 | 55 | ||
| 56 | /* Include the ID list */ | 56 | /* Include the ID list */ |
| 57 | #include <linux/pci_ids.h> | 57 | #include <linux/pci_ids.h> |