diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/pci.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index a1b04d8a1d..68dd42b9ba 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -119,7 +119,6 @@ header-y += nfs4_mount.h | |||
| 119 | header-y += nfs_mount.h | 119 | header-y += nfs_mount.h |
| 120 | header-y += oom.h | 120 | header-y += oom.h |
| 121 | header-y += param.h | 121 | header-y += param.h |
| 122 | header-y += pci_ids.h | ||
| 123 | header-y += pci_regs.h | 122 | header-y += pci_regs.h |
| 124 | header-y += personality.h | 123 | header-y += personality.h |
| 125 | header-y += pfkeyv2.h | 124 | header-y += pfkeyv2.h |
| @@ -162,7 +161,6 @@ header-y += vt.h | |||
| 162 | header-y += wireless.h | 161 | header-y += wireless.h |
| 163 | header-y += xattr.h | 162 | header-y += xattr.h |
| 164 | header-y += x25.h | 163 | header-y += x25.h |
| 165 | header-y += zorro_ids.h | ||
| 166 | 164 | ||
| 167 | unifdef-y += acct.h | 165 | unifdef-y += acct.h |
| 168 | unifdef-y += adb.h | 166 | unifdef-y += adb.h |
diff --git a/include/linux/pci.h b/include/linux/pci.h index c1a2bc8e09..f3c617eabd 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -20,9 +20,6 @@ | |||
| 20 | /* Include the pci register defines */ | 20 | /* Include the pci register defines */ |
| 21 | #include <linux/pci_regs.h> | 21 | #include <linux/pci_regs.h> |
| 22 | 22 | ||
| 23 | /* Include the ID list */ | ||
| 24 | #include <linux/pci_ids.h> | ||
| 25 | |||
| 26 | /* | 23 | /* |
| 27 | * The PCI interface treats multi-function devices as independent | 24 | * The PCI interface treats multi-function devices as independent |
| 28 | * devices. The slot/function address of each device is encoded | 25 | * devices. The slot/function address of each device is encoded |
| @@ -54,6 +51,9 @@ | |||
| 54 | #include <asm/atomic.h> | 51 | #include <asm/atomic.h> |
| 55 | #include <linux/device.h> | 52 | #include <linux/device.h> |
| 56 | 53 | ||
| 54 | /* Include the ID list */ | ||
| 55 | #include <linux/pci_ids.h> | ||
| 56 | |||
| 57 | /* File state for mmap()s on /proc/bus/pci/X/Y */ | 57 | /* File state for mmap()s on /proc/bus/pci/X/Y */ |
| 58 | enum pci_mmap_state { | 58 | enum pci_mmap_state { |
| 59 | pci_mmap_io, | 59 | pci_mmap_io, |
