diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 00:35:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 00:35:25 +0100 |
| commit | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (patch) | |
| tree | c685060f260410e6704c9dfd457ed8c347141f1d /arch/arm/kernel/bios32.c | |
| parent | Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', '... (diff) | |
| parent | ARM: 6806/1: irq: introduce entry and exit functions for chained handlers (diff) | |
| download | linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.tar.xz linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/kernel/bios32.c')
| -rw-r--r-- | arch/arm/kernel/bios32.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index c6273a3bfc25..d86fcd44b220 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -583,6 +583,11 @@ void __init pci_common_init(struct hw_pci *hw) * Assign resources. */ pci_bus_assign_resources(bus); + + /* + * Enable bridges + */ + pci_enable_bridges(bus); } /* |