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 'l2x0-pull-rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-h4.c
diff --git
a/arch/arm/mach-omap2/board-h4.c
b/arch/arm/mach-omap2/board-h4.c
index
cc39fc8
..
929993b
100644
(file)
--- a/
arch/arm/mach-omap2/board-h4.c
+++ b/
arch/arm/mach-omap2/board-h4.c
@@
-31,7
+31,6
@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <plat/control.h>
#include <mach/gpio.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <mach/gpio.h>
#include <plat/usb.h>
#include <plat/board.h>
@@
-42,6
+41,7
@@
#include <plat/gpmc.h>
#include "mux.h"
#include <plat/gpmc.h>
#include "mux.h"
+#include "control.h"
#define H4_FLASH_CS 0
#define H4_SMC91X_CS 1
#define H4_FLASH_CS 0
#define H4_SMC91X_CS 1