Commit 5a9d3732 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King

[ARM PATCH] 2485/1: fix enp2611 coexistence with other machine types

Patch from Lennert Buytenhek

If enp2611 support is compiled in, the kernel will unconditionally
perform enp2611-style PCI initialisation.  Conditionalise this on
machine_is_enp2611().

Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King
parent 9a7a579e
...@@ -151,7 +151,9 @@ struct hw_pci enp2611_pci __initdata = { ...@@ -151,7 +151,9 @@ struct hw_pci enp2611_pci __initdata = {
int __init enp2611_pci_init(void) int __init enp2611_pci_init(void)
{ {
pci_common_init(&enp2611_pci); if (machine_is_enp2611())
pci_common_init(&enp2611_pci);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment