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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-orion5x
/
dns323-setup.c
diff --git
a/arch/arm/mach-orion5x/dns323-setup.c
b/arch/arm/mach-orion5x/dns323-setup.c
index 3791ca6f001a641861aa13aa27d0bd09557ae28a..1a1d84b80a6521bed1de34ded745db7a643f0ac8 100644
(file)
--- a/
arch/arm/mach-orion5x/dns323-setup.c
+++ b/
arch/arm/mach-orion5x/dns323-setup.c
@@
-25,7
+25,7
@@
#include <asm/gpio.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
-#include <
asm/ar
ch/orion5x.h>
+#include <
ma
ch/orion5x.h>
#include "common.h"
#include "mpp.h"