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 commit 'v2.6.27-rc8' into x86/setup
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
pcie.c
diff --git
a/arch/arm/mach-kirkwood/pcie.c
b/arch/arm/mach-kirkwood/pcie.c
index
8282d0f
..
2195fa3
100644
(file)
--- a/
arch/arm/mach-kirkwood/pcie.c
+++ b/
arch/arm/mach-kirkwood/pcie.c
@@
-12,7
+12,7
@@
#include <linux/pci.h>
#include <linux/mbus.h>
#include <asm/mach/pci.h>
-#include <
asm/plat-orion
/pcie.h>
+#include <
plat
/pcie.h>
#include "common.h"