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 branch 'linux-next' of git://git.infradead.org/ubifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
zylonite_pxa320.c
diff --git
a/arch/arm/mach-pxa/zylonite_pxa320.c
b/arch/arm/mach-pxa/zylonite_pxa320.c
index
28e4e62
..
4e1c488
100644
(file)
--- a/
arch/arm/mach-pxa/zylonite_pxa320.c
+++ b/
arch/arm/mach-pxa/zylonite_pxa320.c
@@
-18,7
+18,7
@@
#include <linux/init.h>
#include <linux/gpio.h>
-#include <mach/
mfp-
pxa320.h>
+#include <mach/pxa320.h>
#include <mach/zylonite.h>
#include "generic.h"