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 '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
generic.c
diff --git
a/arch/arm/mach-pxa/generic.c
b/arch/arm/mach-pxa/generic.c
index
f5d91ef
..
5432ecb
100644
(file)
--- a/
arch/arm/mach-pxa/generic.c
+++ b/
arch/arm/mach-pxa/generic.c
@@
-16,6
+16,7
@@
* initialization stuff for PXA machines which can be overridden later if
* need be.
*/
* initialization stuff for PXA machines which can be overridden later if
* need be.
*/
+#include <linux/gpio.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-26,7
+27,6
@@
#include <asm/mach-types.h>
#include <mach/reset.h>
#include <asm/mach-types.h>
#include <mach/reset.h>
-#include <mach/gpio.h>
#include <mach/smemc.h>
#include <mach/pxa3xx-regs.h>
#include <mach/smemc.h>
#include <mach/pxa3xx-regs.h>