From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/pci/access.c | 12 +++++----- drivers/pci/bus.c | 6 ++--- drivers/pci/msi.c | 8 +++--- drivers/pci/pci-acpi.c | 4 +-- drivers/pci/pci-driver.c | 16 ++++++------- drivers/pci/pci.c | 54 +++++++++++++++++++++++------------------------ drivers/pci/probe.c | 14 ++++++------ drivers/pci/proc.c | 4 +-- drivers/pci/quirks.c | 4 +-- drivers/pci/remove.c | 6 ++--- drivers/pci/rom.c | 8 +++--- drivers/pci/search.c | 20 ++++++++--------- drivers/pci/setup-bus.c | 6 ++--- 13 files changed, 81 insertions(+), 81 deletions(-) diff -puN drivers/pci/access.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/access.c --- devel/drivers/pci/access.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/access.c 2005-12-22 04:31:53.000000000 -0800 @@ -56,12 +56,12 @@ PCI_OP_WRITE(byte, u8, 1) PCI_OP_WRITE(word, u16, 2) PCI_OP_WRITE(dword, u32, 4) -EXPORT_SYMBOL_GPL(pci_bus_read_config_byte); -EXPORT_SYMBOL_GPL(pci_bus_read_config_word); -EXPORT_SYMBOL_GPL(pci_bus_read_config_dword); -EXPORT_SYMBOL_GPL(pci_bus_write_config_byte); -EXPORT_SYMBOL_GPL(pci_bus_write_config_word); -EXPORT_SYMBOL_GPL(pci_bus_write_config_dword); +EXPORT_SYMBOL(pci_bus_read_config_byte); +EXPORT_SYMBOL(pci_bus_read_config_word); +EXPORT_SYMBOL(pci_bus_read_config_dword); +EXPORT_SYMBOL(pci_bus_write_config_byte); +EXPORT_SYMBOL(pci_bus_write_config_word); +EXPORT_SYMBOL(pci_bus_write_config_dword); static u32 pci_user_cached_config(struct pci_dev *dev, int pos) { diff -puN drivers/pci/bus.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/bus.c --- devel/drivers/pci/bus.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/bus.c 2005-12-22 04:31:53.000000000 -0800 @@ -199,7 +199,7 @@ void pci_walk_bus(struct pci_bus *top, v } EXPORT_SYMBOL_GPL(pci_walk_bus); -EXPORT_SYMBOL_GPL(pci_bus_alloc_resource); +EXPORT_SYMBOL(pci_bus_alloc_resource); EXPORT_SYMBOL_GPL(pci_bus_add_device); -EXPORT_SYMBOL_GPL(pci_bus_add_devices); -EXPORT_SYMBOL_GPL(pci_enable_bridges); +EXPORT_SYMBOL(pci_bus_add_devices); +EXPORT_SYMBOL(pci_enable_bridges); diff -puN drivers/pci/msi.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/msi.c --- devel/drivers/pci/msi.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/msi.c 2005-12-22 04:31:53.000000000 -0800 @@ -1119,7 +1119,7 @@ void msi_remove_pci_irq_vectors(struct p } } -EXPORT_SYMBOL_GPL(pci_enable_msi); -EXPORT_SYMBOL_GPL(pci_disable_msi); -EXPORT_SYMBOL_GPL(pci_enable_msix); -EXPORT_SYMBOL_GPL(pci_disable_msix); +EXPORT_SYMBOL(pci_enable_msi); +EXPORT_SYMBOL(pci_disable_msi); +EXPORT_SYMBOL(pci_enable_msix); +EXPORT_SYMBOL(pci_disable_msix); diff -puN drivers/pci/pci-acpi.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/pci-acpi.c --- devel/drivers/pci/pci-acpi.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/pci-acpi.c 2005-12-22 04:31:53.000000000 -0800 @@ -174,7 +174,7 @@ acpi_status pci_osc_support_set(u32 flag ctrlset_buf[OSC_CONTROL_TYPE] = temp; return AE_OK; } -EXPORT_SYMBOL_GPL(pci_osc_support_set); +EXPORT_SYMBOL(pci_osc_support_set); /** * pci_osc_control_set - commit requested control to Firmware @@ -204,7 +204,7 @@ acpi_status pci_osc_control_set(acpi_han return status; } -EXPORT_SYMBOL_GPL(pci_osc_control_set); +EXPORT_SYMBOL(pci_osc_control_set); /* * _SxD returns the D-state with the highest power diff -puN drivers/pci/pci.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/pci.c --- devel/drivers/pci/pci.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/pci.c 2005-12-22 04:32:47.000000000 -0800 @@ -427,7 +427,7 @@ pci_power_t pci_choose_state(struct pci_ return PCI_D0; } -EXPORT_SYMBOL_GPL(pci_choose_state); +EXPORT_SYMBOL(pci_choose_state); /** * pci_save_state - save the PCI configuration space of a device before suspending @@ -912,34 +912,34 @@ __setup("pci=", pci_setup); #if defined(CONFIG_ISA) || defined(CONFIG_EISA) /* FIXME: Some boxes have multiple ISA bridges! */ struct pci_dev *isa_bridge; -EXPORT_SYMBOL_GPL(isa_bridge); +EXPORT_SYMBOL(isa_bridge); #endif -EXPORT_SYMBOL_GPL(pci_restore_bars); -EXPORT_SYMBOL_GPL(pci_enable_device_bars); -EXPORT_SYMBOL_GPL(pci_enable_device); -EXPORT_SYMBOL_GPL(pci_disable_device); -EXPORT_SYMBOL_GPL(pci_find_capability); -EXPORT_SYMBOL_GPL(pci_bus_find_capability); -EXPORT_SYMBOL_GPL(pci_release_regions); -EXPORT_SYMBOL_GPL(pci_request_regions); -EXPORT_SYMBOL_GPL(pci_release_region); -EXPORT_SYMBOL_GPL(pci_request_region); -EXPORT_SYMBOL_GPL(pci_set_master); -EXPORT_SYMBOL_GPL(pci_set_mwi); -EXPORT_SYMBOL_GPL(pci_clear_mwi); -EXPORT_SYMBOL_GPL(pci_intx); -EXPORT_SYMBOL_GPL(pci_set_dma_mask); -EXPORT_SYMBOL_GPL(pci_set_consistent_dma_mask); -EXPORT_SYMBOL_GPL(pci_assign_resource); -EXPORT_SYMBOL_GPL(pci_find_parent_resource); - -EXPORT_SYMBOL_GPL(pci_set_power_state); -EXPORT_SYMBOL_GPL(pci_save_state); -EXPORT_SYMBOL_GPL(pci_restore_state); -EXPORT_SYMBOL_GPL(pci_enable_wake); +EXPORT_SYMBOL(pci_restore_bars); +EXPORT_SYMBOL(pci_enable_device_bars); +EXPORT_SYMBOL(pci_enable_device); +EXPORT_SYMBOL(pci_disable_device); +EXPORT_SYMBOL(pci_find_capability); +EXPORT_SYMBOL(pci_bus_find_capability); +EXPORT_SYMBOL(pci_release_regions); +EXPORT_SYMBOL(pci_request_regions); +EXPORT_SYMBOL(pci_release_region); +EXPORT_SYMBOL(pci_request_region); +EXPORT_SYMBOL(pci_set_master); +EXPORT_SYMBOL(pci_set_mwi); +EXPORT_SYMBOL(pci_clear_mwi); +EXPORT_SYMBOL(pci_intx); +EXPORT_SYMBOL(pci_set_dma_mask); +EXPORT_SYMBOL(pci_set_consistent_dma_mask); +EXPORT_SYMBOL(pci_assign_resource); +EXPORT_SYMBOL(pci_find_parent_resource); + +EXPORT_SYMBOL(pci_set_power_state); +EXPORT_SYMBOL(pci_save_state); +EXPORT_SYMBOL(pci_restore_state); +EXPORT_SYMBOL(pci_enable_wake); /* Quirk info */ -EXPORT_SYMBOL_GPL(isa_dma_bridge_buggy); -EXPORT_SYMBOL_GPL(pci_pci_problems); +EXPORT_SYMBOL(isa_dma_bridge_buggy); +EXPORT_SYMBOL(pci_pci_problems); diff -puN drivers/pci/pci-driver.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/pci-driver.c --- devel/drivers/pci/pci-driver.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/pci-driver.c 2005-12-22 04:31:53.000000000 -0800 @@ -525,11 +525,11 @@ static int __init pci_driver_init(void) postcore_initcall(pci_driver_init); -EXPORT_SYMBOL_GPL(pci_match_id); -EXPORT_SYMBOL_GPL(pci_match_device); -EXPORT_SYMBOL_GPL(__pci_register_driver); -EXPORT_SYMBOL_GPL(pci_unregister_driver); -EXPORT_SYMBOL_GPL(pci_dev_driver); -EXPORT_SYMBOL_GPL(pci_bus_type); -EXPORT_SYMBOL_GPL(pci_dev_get); -EXPORT_SYMBOL_GPL(pci_dev_put); +EXPORT_SYMBOL(pci_match_id); +EXPORT_SYMBOL(pci_match_device); +EXPORT_SYMBOL(__pci_register_driver); +EXPORT_SYMBOL(pci_unregister_driver); +EXPORT_SYMBOL(pci_dev_driver); +EXPORT_SYMBOL(pci_bus_type); +EXPORT_SYMBOL(pci_dev_get); +EXPORT_SYMBOL(pci_dev_put); diff -puN drivers/pci/probe.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/probe.c --- devel/drivers/pci/probe.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/probe.c 2005-12-22 04:31:53.000000000 -0800 @@ -18,7 +18,7 @@ /* Ugh. Need to stop exporting this to modules. */ LIST_HEAD(pci_root_buses); -EXPORT_SYMBOL_GPL(pci_root_buses); +EXPORT_SYMBOL(pci_root_buses); LIST_HEAD(pci_devices); @@ -1031,13 +1031,13 @@ struct pci_bus * __devinit pci_scan_bus_ b->subordinate = pci_scan_child_bus(b); return b; } -EXPORT_SYMBOL_GPL(pci_scan_bus_parented); +EXPORT_SYMBOL(pci_scan_bus_parented); #ifdef CONFIG_HOTPLUG -EXPORT_SYMBOL_GPL(pci_add_new_bus); -EXPORT_SYMBOL_GPL(pci_do_scan_bus); -EXPORT_SYMBOL_GPL(pci_scan_slot); -EXPORT_SYMBOL_GPL(pci_scan_bridge); -EXPORT_SYMBOL_GPL(pci_scan_single_device); +EXPORT_SYMBOL(pci_add_new_bus); +EXPORT_SYMBOL(pci_do_scan_bus); +EXPORT_SYMBOL(pci_scan_slot); +EXPORT_SYMBOL(pci_scan_bridge); +EXPORT_SYMBOL(pci_scan_single_device); EXPORT_SYMBOL_GPL(pci_scan_child_bus); #endif diff -puN drivers/pci/proc.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/proc.c --- devel/drivers/pci/proc.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/proc.c 2005-12-22 04:32:57.000000000 -0800 @@ -613,7 +613,7 @@ static int __init pci_proc_init(void) __initcall(pci_proc_init); #ifdef CONFIG_HOTPLUG -EXPORT_SYMBOL_GPL(pci_proc_attach_device); -EXPORT_SYMBOL_GPL(pci_proc_detach_bus); +EXPORT_SYMBOL(pci_proc_attach_device); +EXPORT_SYMBOL(pci_proc_detach_bus); #endif diff -puN drivers/pci/quirks.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/quirks.c --- devel/drivers/pci/quirks.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/quirks.c 2005-12-22 04:31:53.000000000 -0800 @@ -1368,7 +1368,7 @@ static void __devinit quirk_p64h2_1k_io( } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1460, quirk_p64h2_1k_io); -EXPORT_SYMBOL_GPL(pcie_mch_quirk); +EXPORT_SYMBOL(pcie_mch_quirk); #ifdef CONFIG_HOTPLUG -EXPORT_SYMBOL_GPL(pci_fixup_device); +EXPORT_SYMBOL(pci_fixup_device); #endif diff -puN drivers/pci/remove.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/remove.c --- devel/drivers/pci/remove.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/remove.c 2005-12-22 04:31:53.000000000 -0800 @@ -71,7 +71,7 @@ void pci_remove_bus(struct pci_bus *pci_ sysfs_remove_link(&pci_bus->class_dev.kobj, "bridge"); class_device_unregister(&pci_bus->class_dev); } -EXPORT_SYMBOL_GPL(pci_remove_bus); +EXPORT_SYMBOL(pci_remove_bus); /** * pci_remove_bus_device - remove a PCI device and any children @@ -119,5 +119,5 @@ void pci_remove_behind_bridge(struct pci } } -EXPORT_SYMBOL_GPL(pci_remove_bus_device); -EXPORT_SYMBOL_GPL(pci_remove_behind_bridge); +EXPORT_SYMBOL(pci_remove_bus_device); +EXPORT_SYMBOL(pci_remove_behind_bridge); diff -puN drivers/pci/rom.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/rom.c --- devel/drivers/pci/rom.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/rom.c 2005-12-22 04:31:53.000000000 -0800 @@ -234,7 +234,7 @@ void pci_cleanup_rom(struct pci_dev *pde } } -EXPORT_SYMBOL_GPL(pci_map_rom); -EXPORT_SYMBOL_GPL(pci_map_rom_copy); -EXPORT_SYMBOL_GPL(pci_unmap_rom); -EXPORT_SYMBOL_GPL(pci_remove_rom); +EXPORT_SYMBOL(pci_map_rom); +EXPORT_SYMBOL(pci_map_rom_copy); +EXPORT_SYMBOL(pci_unmap_rom); +EXPORT_SYMBOL(pci_remove_rom); diff -puN drivers/pci/search.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/search.c --- devel/drivers/pci/search.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/search.c 2005-12-22 04:31:53.000000000 -0800 @@ -376,14 +376,14 @@ exit: spin_unlock(&pci_bus_lock); return found; } -EXPORT_SYMBOL_GPL(pci_dev_present); +EXPORT_SYMBOL(pci_dev_present); -EXPORT_SYMBOL_GPL(pci_find_bus); -EXPORT_SYMBOL_GPL(pci_find_next_bus); -EXPORT_SYMBOL_GPL(pci_find_device); -EXPORT_SYMBOL_GPL(pci_find_device_reverse); -EXPORT_SYMBOL_GPL(pci_find_slot); -EXPORT_SYMBOL_GPL(pci_get_device); -EXPORT_SYMBOL_GPL(pci_get_subsys); -EXPORT_SYMBOL_GPL(pci_get_slot); -EXPORT_SYMBOL_GPL(pci_get_class); +EXPORT_SYMBOL(pci_find_bus); +EXPORT_SYMBOL(pci_find_next_bus); +EXPORT_SYMBOL(pci_find_device); +EXPORT_SYMBOL(pci_find_device_reverse); +EXPORT_SYMBOL(pci_find_slot); +EXPORT_SYMBOL(pci_get_device); +EXPORT_SYMBOL(pci_get_subsys); +EXPORT_SYMBOL(pci_get_slot); +EXPORT_SYMBOL(pci_get_class); diff -puN drivers/pci/setup-bus.c~revert-gregkh-pci-shot-accross-the-bow drivers/pci/setup-bus.c --- devel/drivers/pci/setup-bus.c~revert-gregkh-pci-shot-accross-the-bow 2005-12-22 04:31:53.000000000 -0800 +++ devel-akpm/drivers/pci/setup-bus.c 2005-12-22 04:31:53.000000000 -0800 @@ -129,7 +129,7 @@ void pci_setup_cardbus(struct pci_bus *b region.end); } } -EXPORT_SYMBOL_GPL(pci_setup_cardbus); +EXPORT_SYMBOL(pci_setup_cardbus); /* Initialize bridges with base/limit values we have collected. PCI-to-PCI Bridge Architecture Specification rev. 1.1 (1998) @@ -493,7 +493,7 @@ pci_bus_size_bridges(struct pci_bus *bus break; } } -EXPORT_SYMBOL_GPL(pci_bus_size_bridges); +EXPORT_SYMBOL(pci_bus_size_bridges); void __devinit pci_bus_assign_resources(struct pci_bus *bus) @@ -526,7 +526,7 @@ pci_bus_assign_resources(struct pci_bus } } } -EXPORT_SYMBOL_GPL(pci_bus_assign_resources); +EXPORT_SYMBOL(pci_bus_assign_resources); void __init pci_assign_unassigned_resources(void) _