diff options
Diffstat (limited to 'arch/arm/mach-shark')
-rw-r--r-- | arch/arm/mach-shark/include/mach/hardware.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-shark/pci.c | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/mach-shark/include/mach/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index 94d84b27a0c..663f952a8ab 100644 --- a/arch/arm/mach-shark/include/mach/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h | |||
@@ -12,11 +12,5 @@ | |||
12 | 12 | ||
13 | #define UNCACHEABLE_ADDR 0xdf010000 | 13 | #define UNCACHEABLE_ADDR 0xdf010000 |
14 | 14 | ||
15 | #define pcibios_assign_all_busses() 1 | ||
16 | |||
17 | #define PCIBIOS_MIN_IO 0x6000 | ||
18 | #define PCIBIOS_MIN_MEM 0x50000000 | ||
19 | #define PCIMEM_BASE 0xe8000000 | ||
20 | |||
21 | #endif | 15 | #endif |
22 | 16 | ||
diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c index 89d175ce74d..92d7227de0a 100644 --- a/arch/arm/mach-shark/pci.c +++ b/arch/arm/mach-shark/pci.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
9 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | #include <video/vga.h> | ||
11 | 12 | ||
12 | #include <asm/irq.h> | 13 | #include <asm/irq.h> |
13 | #include <asm/mach/pci.h> | 14 | #include <asm/mach/pci.h> |
@@ -37,8 +38,15 @@ static struct hw_pci shark_pci __initdata = { | |||
37 | 38 | ||
38 | static int __init shark_pci_init(void) | 39 | static int __init shark_pci_init(void) |
39 | { | 40 | { |
40 | if (machine_is_shark()) | 41 | if (!machine_is_shark()) |
41 | pci_common_init(&shark_pci); | 42 | return; |
43 | |||
44 | pcibios_min_io = 0x6000; | ||
45 | pcibios_min_mem = 0x50000000; | ||
46 | vga_base = 0xe8000000; | ||
47 | |||
48 | pci_common_init(&shark_pci); | ||
49 | |||
42 | return 0; | 50 | return 0; |
43 | } | 51 | } |
44 | 52 | ||