aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shark/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-shark/pci.c')
-rw-r--r--arch/arm/mach-shark/pci.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c
index 89d175ce74d2..7cb79a092f31 100644
--- a/arch/arm/mach-shark/pci.c
+++ b/arch/arm/mach-shark/pci.c
@@ -8,12 +8,13 @@
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>
14#include <asm/mach-types.h> 15#include <asm/mach-types.h>
15 16
16static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 17static int __init shark_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
17{ 18{
18 if (dev->bus->number == 0) 19 if (dev->bus->number == 0)
19 if (dev->devfn == 0) 20 if (dev->devfn == 0)
@@ -37,8 +38,15 @@ static struct hw_pci shark_pci __initdata = {
37 38
38static int __init shark_pci_init(void) 39static 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