diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-27 19:30:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-27 19:30:13 +0100 |
| commit | e4e4146ec5a0a4221eee051365422ad70cddb673 (patch) | |
| tree | 96e99d23ebc31fad84e40cb323dfe33b0e6af6d0 /arch/arm/mach-orion5x/kurobox_pro-setup.c | |
| parent | 9abc6461a3802702ada88cbac1fed045dbd9b466 (diff) | |
| parent | 8e05de88cf5a8ab225697ba12d5f19ec594169ef (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-orion5x/kurobox_pro-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index cb72f1bb9cb..e321ec33183 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c @@ -146,8 +146,10 @@ static struct hw_pci kurobox_pro_pci __initdata = { static int __init kurobox_pro_pci_init(void) { - if (machine_is_kurobox_pro()) + if (machine_is_kurobox_pro()) { + orion5x_pci_disable(); pci_common_init(&kurobox_pro_pci); + } return 0; } |