aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-19 13:12:07 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-20 10:54:43 -0800
commit7e7a43c32a8970ea2bfc3d1af353dcb1a9237769 (patch)
treea67114cd38a106f14112557239b5053e44a50cc1
parent9ac0ce8596b17093739d42721cc8a616cedf734b (diff)
PCI: don't export device IDs to userspace
I don't see any good reason for exporting device IDs to userspace. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/linux/Kbuild2
-rw-r--r--include/linux/pci.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index a1b04d8a1d0..68dd42b9bac 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -119,7 +119,6 @@ header-y += nfs4_mount.h
header-y += nfs_mount.h
header-y += oom.h
header-y += param.h
-header-y += pci_ids.h
header-y += pci_regs.h
header-y += personality.h
header-y += pfkeyv2.h
@@ -162,7 +161,6 @@ header-y += vt.h
header-y += wireless.h
header-y += xattr.h
header-y += x25.h
-header-y += zorro_ids.h
unifdef-y += acct.h
unifdef-y += adb.h
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c1a2bc8e09d..f3c617eabd8 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -20,9 +20,6 @@
/* Include the pci register defines */
#include <linux/pci_regs.h>
-/* Include the ID list */
-#include <linux/pci_ids.h>
-
/*
* The PCI interface treats multi-function devices as independent
* devices. The slot/function address of each device is encoded
@@ -54,6 +51,9 @@
#include <asm/atomic.h>
#include <linux/device.h>
+/* Include the ID list */
+#include <linux/pci_ids.h>
+
/* File state for mmap()s on /proc/bus/pci/X/Y */
enum pci_mmap_state {
pci_mmap_io,