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

Commit a7e2a89a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Tony Lindgren
Browse files

wip: fix section mismatches in omap1_defconfig 



after these changes omap1_defconfig and omap2plus_defconfig don't have any
section mismatches any more, making it plausible that the patches earlier
in this series are OK.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 119c4c2c

arch/arm/mach-omap1/board-ams-delta.c

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static struct omap_usb_config ams_delta_usb_config __initdata = { 
	.pins[0]	= 2,

};



static struct omap_board_config_kernel ams_delta_config[] = {

static struct omap_board_config_kernel ams_delta_config[] __initdata = {

	{ OMAP_TAG_LCD,		&ams_delta_lcd_config },

};
@@ -259,7 +259,7 @@ static int ams_delta_camera_power(struct device *dev, int power) 
#define ams_delta_camera_power	NULL

#endif



static struct soc_camera_link ams_delta_iclink __initdata = {

static struct soc_camera_link ams_delta_iclink = {

	.bus_id         = 0,	/* OMAP1 SoC camera bus */

	.i2c_adapter_id = 1,

	.board_info     = &ams_delta_camera_board_info[0],

arch/arm/mach-omap1/board-fsample.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static struct omap_lcd_config fsample_lcd_config = { 
	.ctrl_name	= "internal",

};



static struct omap_board_config_kernel fsample_config[] = {

static struct omap_board_config_kernel fsample_config[] __initdata = {

	{ OMAP_TAG_LCD,		&fsample_lcd_config },

};

drivers/usb/otg/isp1301_omap.c

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ isp1301_start_hnp(struct otg_transceiver *dev) 


/*-------------------------------------------------------------------------*/



static int __init

static int __devinit

isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)

{

	int			status;