projects
/
firefly-linux-kernel-4.4.55.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
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3beagle.c
diff --git
a/arch/arm/mach-omap2/board-omap3beagle.c
b/arch/arm/mach-omap2/board-omap3beagle.c
index a4131bef50fbcee778c2dc5883376eb7bc983edb..f1a8edefa42f41f7bc6fe18b2f8e60bf776b76b5 100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3beagle.c
+++ b/
arch/arm/mach-omap2/board-omap3beagle.c
@@
-547,8
+547,6
@@
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
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 = {