diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-09 18:48:03 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-09 18:48:03 -0500 |
| commit | c451278c2864e253a4bb303b596a29edc3bb527c (patch) | |
| tree | 380f246741024593b7513a68712eb1a4cabdd54e /arch/arm/mach-omap2/board-ldp.c | |
| parent | 7b045c96cd1405597a6a2e98bc53a4ac01d835b1 (diff) | |
| parent | 5403187f83c12c6f4c03547e0cc05bac0310be7b (diff) | |
Merge branch 'devel-cleanup' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 001fd9713f39..84b4ea67d156 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -381,8 +381,6 @@ static struct platform_device *ldp_devices[] __initdata = { | |||
| 381 | static struct omap_board_mux board_mux[] __initdata = { | 381 | static struct omap_board_mux board_mux[] __initdata = { |
| 382 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 382 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
| 383 | }; | 383 | }; |
| 384 | #else | ||
| 385 | #define board_mux NULL | ||
| 386 | #endif | 384 | #endif |
| 387 | 385 | ||
| 388 | static struct omap_musb_board_data musb_board_data = { | 386 | static struct omap_musb_board_data musb_board_data = { |