Commit 2d887872 authored by Linus Torvalds's avatar Linus Torvalds Committed by Linus Torvalds

Merge http://gkernel.bkbits.net/misc-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 3eb69ef2 8bf02a15
...@@ -2019,11 +2019,13 @@ EXPORT_SYMBOL(pci_announce_device_to_drivers); ...@@ -2019,11 +2019,13 @@ EXPORT_SYMBOL(pci_announce_device_to_drivers);
EXPORT_SYMBOL(pci_add_new_bus); EXPORT_SYMBOL(pci_add_new_bus);
EXPORT_SYMBOL(pci_do_scan_bus); EXPORT_SYMBOL(pci_do_scan_bus);
EXPORT_SYMBOL(pci_scan_slot); EXPORT_SYMBOL(pci_scan_slot);
#ifdef CONFIG_PROC_FS
EXPORT_SYMBOL(pci_proc_attach_device); EXPORT_SYMBOL(pci_proc_attach_device);
EXPORT_SYMBOL(pci_proc_detach_device); EXPORT_SYMBOL(pci_proc_detach_device);
EXPORT_SYMBOL(pci_proc_attach_bus); EXPORT_SYMBOL(pci_proc_attach_bus);
EXPORT_SYMBOL(pci_proc_detach_bus); EXPORT_SYMBOL(pci_proc_detach_bus);
#endif #endif
#endif
EXPORT_SYMBOL(pci_set_power_state); EXPORT_SYMBOL(pci_set_power_state);
EXPORT_SYMBOL(pci_save_state); EXPORT_SYMBOL(pci_save_state);
......
...@@ -354,8 +354,6 @@ static inline void via_card_cleanup_proc (struct via_info *card) {} ...@@ -354,8 +354,6 @@ static inline void via_card_cleanup_proc (struct via_info *card) {}
static struct pci_device_id via_pci_tbl[] __initdata = { static struct pci_device_id via_pci_tbl[] __initdata = {
{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5,
PCI_ANY_ID, PCI_ANY_ID, }, PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5,
PCI_ANY_ID, PCI_ANY_ID, },
{ 0, } { 0, }
}; };
MODULE_DEVICE_TABLE(pci,via_pci_tbl); MODULE_DEVICE_TABLE(pci,via_pci_tbl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment