Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-06 18:28:58 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-03-06 18:28:58 -0800
commit2d887872ca3b80aa8f56e233ade8291873814758 (patch)
treed1a743992622a355cff9e99b2c55ff2ea68fb65c
parent3eb69ef25e727f1f7a4ac3825db3aa5359dde363 (diff)
parent8bf02a154fbc0c2b126a95a6ec2d4c2a3b295fd2 (diff)
Merge http://gkernel.bkbits.net/misc-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
-rw-r--r--drivers/pci/pci.c2
-rw-r--r--sound/oss/via82cxxx_audio.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index c41975638b82..93bd9cf9ce4f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2019,11 +2019,13 @@ EXPORT_SYMBOL(pci_announce_device_to_drivers);
EXPORT_SYMBOL(pci_add_new_bus);
EXPORT_SYMBOL(pci_do_scan_bus);
EXPORT_SYMBOL(pci_scan_slot);
+#ifdef CONFIG_PROC_FS
EXPORT_SYMBOL(pci_proc_attach_device);
EXPORT_SYMBOL(pci_proc_detach_device);
EXPORT_SYMBOL(pci_proc_attach_bus);
EXPORT_SYMBOL(pci_proc_detach_bus);
#endif
+#endif
EXPORT_SYMBOL(pci_set_power_state);
EXPORT_SYMBOL(pci_save_state);
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index f49f2ca18c7f..70d27cb5621b 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -354,8 +354,6 @@ static inline void via_card_cleanup_proc (struct via_info *card) {}
static struct pci_device_id via_pci_tbl[] __initdata = {
{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5,
PCI_ANY_ID, PCI_ANY_ID, },
- { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5,
- PCI_ANY_ID, PCI_ANY_ID, },
{ 0, }
};
MODULE_DEVICE_TABLE(pci,via_pci_tbl);