diff options
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index fcf0ae95651f..8cdc730dcb3a 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
| 33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 34 | #include <linux/mtd/physmap.h> | 34 | #include <linux/mtd/physmap.h> |
| 35 | #include <video/vga.h> | ||
| 35 | 36 | ||
| 36 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
| 37 | #include <mach/platform.h> | 38 | #include <mach/platform.h> |
| @@ -154,6 +155,7 @@ static struct map_desc ap_io_desc[] __initdata = { | |||
| 154 | static void __init ap_map_io(void) | 155 | static void __init ap_map_io(void) |
| 155 | { | 156 | { |
| 156 | iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc)); | 157 | iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc)); |
| 158 | vga_base = PCI_MEMORY_VADDR; | ||
| 157 | } | 159 | } |
| 158 | 160 | ||
| 159 | #define INTEGRATOR_SC_VALID_INT 0x003fffff | 161 | #define INTEGRATOR_SC_VALID_INT 0x003fffff |
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index dd56bfb351e3..11b86e5b71c2 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| 30 | #include <video/vga.h> | ||
| 31 | 30 | ||
| 32 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
| 33 | #include <mach/platform.h> | 32 | #include <mach/platform.h> |
| @@ -505,7 +504,6 @@ void __init pci_v3_preinit(void) | |||
| 505 | 504 | ||
| 506 | pcibios_min_io = 0x6000; | 505 | pcibios_min_io = 0x6000; |
| 507 | pcibios_min_mem = 0x00100000; | 506 | pcibios_min_mem = 0x00100000; |
| 508 | vga_base = PCI_MEMORY_VADDR; | ||
| 509 | 507 | ||
| 510 | /* | 508 | /* |
| 511 | * Hook in our fault handler for PCI errors | 509 | * Hook in our fault handler for PCI errors |
