Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c451278c authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'devel-cleanup' into omap-for-linus

parents 7b045c96 5403187f

arch/arm/mach-omap2/board-2430sdp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -218,8 +218,6 @@ static struct omap_usb_config sdp2430_usb_config __initdata = { 
static struct omap_board_mux board_mux[] __initdata = {

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

};

#else

#define board_mux	NULL

#endif

#endif





static void __init omap_2430sdp_init(void)

static void __init omap_2430sdp_init(void)

arch/arm/mach-omap2/board-3430sdp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -663,8 +663,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 
static struct omap_board_mux board_mux[] __initdata = {

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

};

#else

#define board_mux	NULL

#endif

#endif





/*

/*

arch/arm/mach-omap2/board-3630sdp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -83,8 +83,6 @@ static void __init omap_sdp_init_irq(void) 
static struct omap_board_mux board_mux[] __initdata = {

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

};

#else

#define board_mux	NULL

#endif

#endif





/*

/*

arch/arm/mach-omap2/board-am3517evm.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -442,8 +442,6 @@ static struct omap_board_mux board_mux[] __initdata = { 
	OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),

	OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),

	{ .reg_offset = OMAP_MUX_TERMINATOR },

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

};

#else

#define board_mux	NULL

#endif

#endif

arch/arm/mach-omap2/board-apollon.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -314,8 +314,6 @@ static void __init apollon_usb_init(void) 
static struct omap_board_mux board_mux[] __initdata = {

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

};

#else

#define board_mux	NULL

#endif

#endif





static void __init omap_apollon_init(void)

static void __init omap_apollon_init(void)