diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 18:10:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 18:10:13 +0200 |
| commit | ef4669db0c9d5f06d5fd169fa461289723a93a91 (patch) | |
| tree | b77ea6e73205326295566d896eda1e2df59383a6 /arch/arm/mach-shark/pci.c | |
| parent | 0bf6b1da1a53e8414d954251b1d13e2cdbd499b4 (diff) | |
| parent | cc22b4c18540e5e8bf55c7d124044f9317527d3c (diff) | |
Merge branch 'next/cross-platform' into for-next
Diffstat (limited to 'arch/arm/mach-shark/pci.c')
| -rw-r--r-- | arch/arm/mach-shark/pci.c | 12 |
1 files changed, 10 insertions, 2 deletions
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 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/init.h> +#include <video/vga.h> #include <asm/irq.h> #include <asm/mach/pci.h> @@ -37,8 +38,15 @@ static struct hw_pci shark_pci __initdata = { static int __init shark_pci_init(void) { - if (machine_is_shark()) - pci_common_init(&shark_pci); + if (!machine_is_shark()) + return; + + pcibios_min_io = 0x6000; + pcibios_min_mem = 0x50000000; + vga_base = 0xe8000000; + + pci_common_init(&shark_pci); + return 0; } |