git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-dove
/
pcie.c
diff --git
a/arch/arm/mach-dove/pcie.c
b/arch/arm/mach-dove/pcie.c
index dfb62f3f5dcf1722b8a69c2443251126dba56968..ee91ac6b5ebf1a96ca207799adf93a13ff98208b 100644
(file)
--- a/
arch/arm/mach-dove/pcie.c
+++ b/
arch/arm/mach-dove/pcie.c
@@
-17,9
+17,9
@@
#include <asm/setup.h>
#include <asm/delay.h>
#include <plat/pcie.h>
-#include <mach/irqs.h>
-#include <mach/bridge-regs.h>
#include <plat/addr-map.h>
+#include "irqs.h"
+#include "bridge-regs.h"
#include "common.h"
struct pcie_port {