diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 10:29:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 10:29:29 -0400 |
| commit | 7ac992ef615c66a05ebb831915935e83c0ec8e05 (patch) | |
| tree | 0bef479fccb4e73733fab628dc525a5959bba925 /arch/microblaze/pci/pci-common.c | |
| parent | 6a251b0ab67989f468f4cb65179e0cf40cf8c295 (diff) | |
| parent | a5e48b88da225580394f825ffe67e444b050074b (diff) | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix module loading on system with WB cache
microblaze: export assembly functions used by modules
microblaze: Remove powerpc code from Microblaze port
microblaze: Remove compilation warnings in cache macro
microblaze: export assembly functions used by modules
microblaze: fix get_user/put_user side-effects
microblaze: re-enable interrupts before calling schedule
Diffstat (limited to 'arch/microblaze/pci/pci-common.c')
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 01c8c97c15b7..9cb782b8e036 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
| @@ -1507,7 +1507,7 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus) | |||
| 1507 | pci_bus_add_devices(bus); | 1507 | pci_bus_add_devices(bus); |
| 1508 | 1508 | ||
| 1509 | /* Fixup EEH */ | 1509 | /* Fixup EEH */ |
| 1510 | eeh_add_device_tree_late(bus); | 1510 | /* eeh_add_device_tree_late(bus); */ |
| 1511 | } | 1511 | } |
| 1512 | EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus); | 1512 | EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus); |
| 1513 | 1513 | ||