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 'devel-gpio' into omap-for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3evm.c
diff --git
a/arch/arm/mach-omap2/board-omap3evm.c
b/arch/arm/mach-omap2/board-omap3evm.c
index
5ca0220
..
21ffc5c
100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3evm.c
+++ b/
arch/arm/mach-omap2/board-omap3evm.c
@@
-653,8
+653,6
@@
static struct omap_board_mux board_mux[] __initdata = {
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
-#else
-#define board_mux NULL
#endif
static struct omap_musb_board_data musb_board_data = {