projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.marvell.com/orion
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
arch
/
arm
/
mach-orion5x
/
kurobox_pro-setup.c
diff --git
a/arch/arm/mach-orion5x/kurobox_pro-setup.c
b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index
171ffaf
..
c5bd54d
100644
(file)
--- 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;
}