From: Adrian Bunk <bunk@stusta.de>

I don't see any good reason for exporting device IDs to userspace.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/Kbuild |    2 --
 include/linux/pci.h  |    6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff -puN include/linux/Kbuild~dont-export-device-ids-to-userspace include/linux/Kbuild
--- a/include/linux/Kbuild~dont-export-device-ids-to-userspace
+++ a/include/linux/Kbuild
@@ -120,7 +120,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
@@ -163,7 +162,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 -puN include/linux/pci.h~dont-export-device-ids-to-userspace include/linux/pci.h
--- a/include/linux/pci.h~dont-export-device-ids-to-userspace
+++ a/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,
_