diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-09 15:48:03 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-09 15:48:03 -0800 |
| commit | c451278c2864e253a4bb303b596a29edc3bb527c (patch) | |
| tree | 380f246741024593b7513a68712eb1a4cabdd54e /arch/arm/mach-omap2/board-apollon.c | |
| parent | 7b045c96cd1405597a6a2e98bc53a4ac01d835b1 (diff) | |
| parent | 5403187f83c12c6f4c03547e0cc05bac0310be7b (diff) | |
| download | kernel_samsung_tuna-c451278c2864e253a4bb303b596a29edc3bb527c.zip kernel_samsung_tuna-c451278c2864e253a4bb303b596a29edc3bb527c.tar.gz kernel_samsung_tuna-c451278c2864e253a4bb303b596a29edc3bb527c.tar.bz2 | |
Merge branch 'devel-cleanup' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 2c6db1a..b01d6e4 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c @@ -314,8 +314,6 @@ static void __init apollon_usb_init(void) static struct omap_board_mux board_mux[] __initdata = { { .reg_offset = OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL #endif static void __init omap_apollon_init(void) |