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 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-palmtt.c
diff --git
a/arch/arm/mach-omap1/board-palmtt.c
b/arch/arm/mach-omap1/board-palmtt.c
index
b214f45
..
f942221
100644
(file)
--- a/
arch/arm/mach-omap1/board-palmtt.c
+++ b/
arch/arm/mach-omap1/board-palmtt.c
@@
-12,6
+12,7
@@
*/
#include <linux/delay.h>
*/
#include <linux/delay.h>
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@
-30,7
+31,6
@@
#include <asm/mach/map.h>
#include <plat/led.h>
#include <asm/mach/map.h>
#include <plat/led.h>
-#include <mach/gpio.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <plat/usb.h>
#include <plat/flash.h>
#include <plat/mux.h>
#include <plat/usb.h>