diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:27:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:27:45 +0200 |
| commit | d939d2851fd12568e2eabb2916769e8a57ba5c89 (patch) | |
| tree | f3158a5ddd41541a61126f9e48de1ce89c632f64 /arch/arm/mach-orion5x/dns323-setup.c | |
| parent | 9f5314fb4d556d3132c784d0df47352b2830ca53 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/irqtip-x86-irq-2008-06-16_09.27_Mon
Diffstat (limited to 'arch/arm/mach-orion5x/dns323-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index f9430f5ca9a8..27ce967ab9e5 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c @@ -58,7 +58,7 @@ static int __init dns323_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) } static struct hw_pci dns323_pci __initdata = { - .nr_controllers = 1, + .nr_controllers = 2, .swizzle = pci_std_swizzle, .setup = orion5x_pci_sys_setup, .scan = orion5x_pci_sys_scan_bus, |