git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://github.com/davem330/sparc
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
pci_v3.c
diff --git
a/arch/arm/mach-integrator/pci_v3.c
b/arch/arm/mach-integrator/pci_v3.c
index
dd56bfb
..
11b86e5
100644
(file)
--- a/
arch/arm/mach-integrator/pci_v3.c
+++ b/
arch/arm/mach-integrator/pci_v3.c
@@
-27,7
+27,6
@@
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/io.h>
-#include <video/vga.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <mach/hardware.h>
#include <mach/platform.h>
@@
-505,7
+504,6
@@
void __init pci_v3_preinit(void)
pcibios_min_io = 0x6000;
pcibios_min_mem = 0x00100000;
pcibios_min_io = 0x6000;
pcibios_min_mem = 0x00100000;
- vga_base = PCI_MEMORY_VADDR;
/*
* Hook in our fault handler for PCI errors
/*
* Hook in our fault handler for PCI errors