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 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa95x.c
diff --git
a/arch/arm/mach-pxa/pxa95x.c
b/arch/arm/mach-pxa/pxa95x.c
index
0ee166b
..
51371b3
100644
(file)
--- a/
arch/arm/mach-pxa/pxa95x.c
+++ b/
arch/arm/mach-pxa/pxa95x.c
@@
-9,7
+9,6
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-21,7
+20,7
@@
#include <linux/syscore_ops.h>
#include <mach/hardware.h>
#include <linux/syscore_ops.h>
#include <mach/hardware.h>
-#include <mach/gpio.h>
+#include <mach/gpio
-pxa
.h>
#include <mach/pxa3xx-regs.h>
#include <mach/pxa930.h>
#include <mach/reset.h>
#include <mach/pxa3xx-regs.h>
#include <mach/pxa930.h>
#include <mach/reset.h>