diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-04-30 21:53:08 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-04-30 21:53:08 -0500 |
| commit | 1a30774ba0aac1b339f32fe271a34b42ca5f67bc (patch) | |
| tree | 3e70f32aa7fab7e14139f8199061be5084c47a60 | |
| parent | a2a32c0a9519e0e70cf7b91c5f06100899765f92 (diff) | |
OMAP4: board_4430: Fixing compilation errors
After solve merge conflicts the following error
comes up:
board-4430sdp.c:435: error: expected expression before 'static'
This patch fix this error, putting proper definitions of:
&wl128x_device
Under structure:
static struct platform_device *sdp4430_devices[]
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
| -rwxr-xr-x | arch/arm/mach-omap2/board-4430sdp.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 26697b3dbba4..7238a2f27fc4 100755 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -431,15 +431,6 @@ static struct omap_dss_device sdp4430_picoDLP_device = { static struct omap_dss_device *sdp4430_dss_devices[] = { -/* wl128x BT, FM, GPS connectivity chip */ -static int gpios[] = {55, -1, -1}; -static struct platform_device wl128x_device = { - .name = "kim", - .id = -1, - .dev.platform_data = &gpios, -}; - -static struct platform_device *sdp4430_devices[] __initdata = { &sdp4430_lcd_device, &sdp4430_lcd2_device, #ifdef CONFIG_OMAP2_DSS_HDMI @@ -504,6 +495,14 @@ static struct regulator_consumer_supply sdp4430_vdda_dac_supply = { .supply = "vdda_dac", .dev = &sdp4430_lcd_device.dev, }; + +/* wl128x BT, FM, GPS connectivity chip */ +static int gpios[] = {55, -1, -1}; +static struct platform_device wl128x_device = { + .name = "kim", + .id = -1, + .dev.platform_data = &gpios, +}; static struct platform_device *sdp4430_devices[] __initdata = { &sdp4430_keypad_device, &sdp4430_proximity_device, |