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 'highbank/soc' into next/soc
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
devices.c
diff --git
a/arch/arm/plat-omap/devices.c
b/arch/arm/plat-omap/devices.c
index
bd9a06b
..
acd132c
100644
(file)
--- a/
arch/arm/plat-omap/devices.c
+++ b/
arch/arm/plat-omap/devices.c
@@
-8,7
+8,7
@@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
-
+#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>
@@
-24,7
+24,6
@@
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/mmc.h>
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/mmc.h>
-#include <mach/gpio.h>
#include <plat/menelaus.h>
#include <plat/omap44xx.h>
#include <plat/menelaus.h>
#include <plat/omap44xx.h>