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-rx51.c
diff --git
a/arch/arm/mach-omap2/board-rx51.c
b/arch/arm/mach-omap2/board-rx51.c
index
1c3b079
..
6635142
100644
(file)
--- a/
arch/arm/mach-omap2/board-rx51.c
+++ b/
arch/arm/mach-omap2/board-rx51.c
@@
-116,8
+116,6
@@
extern void __init rx51_peripherals_init(void);
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
-#else
-#define board_mux NULL
#endif
static struct omap_musb_board_data musb_board_data = {