diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-02-09 21:40:10 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-09 16:40:30 -0800 |
| commit | a7e2a89abb8387a377f3bf6d483d0938b5735854 (patch) | |
| tree | c6c511b0d43d9c562d5f01c8dad244937f84593e /arch/arm/mach-omap1 | |
| parent | 119c4c2cce34a07c98f0166ad679135bb62621ec (diff) | |
| download | talos-obmc-linux-a7e2a89abb8387a377f3bf6d483d0938b5735854.tar.gz talos-obmc-linux-a7e2a89abb8387a377f3bf6d483d0938b5735854.zip | |
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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 2f446a2658a4..de88c9297b68 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -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], diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 27fb1be0f20a..87f173d93557 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c @@ -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 }, }; |
