Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271454
b: refs/heads/master
c: 4010c07
h: refs/heads/master
v: v3
  • Loading branch information
Tomi Valkeinen committed Sep 30, 2011
1 parent f862b8e commit 0e782da
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 212b0d50e2eb7fc60f7bea1e90e5867b5fc0647d
refs/heads/master: 4010c07c2307a8238ef4a742d4080de4a577575b
17 changes: 0 additions & 17 deletions trunk/arch/arm/mach-omap2/board-4430sdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,6 @@ static int __init omap_ethernet_init(void)
return status;
}

static struct platform_device sdp4430_lcd_device = {
.name = "sdp4430_lcd",
.id = -1,
};

static struct regulator_consumer_supply sdp4430_vbat_supply[] = {
REGULATOR_SUPPLY("vddvibl", "twl6040-vibra"),
REGULATOR_SUPPLY("vddvibr", "twl6040-vibra"),
Expand Down Expand Up @@ -374,21 +369,12 @@ static struct platform_device sdp4430_vbat = {
};

static struct platform_device *sdp4430_devices[] __initdata = {
&sdp4430_lcd_device,
&sdp4430_gpio_keys_device,
&sdp4430_leds_gpio,
&sdp4430_leds_pwm,
&sdp4430_vbat,
};

static struct omap_lcd_config sdp4430_lcd_config __initdata = {
.ctrl_name = "internal",
};

static struct omap_board_config_kernel sdp4430_config[] __initdata = {
{ OMAP_TAG_LCD, &sdp4430_lcd_config },
};

static void __init omap_4430sdp_init_early(void)
{
omap2_init_common_infrastructure();
Expand Down Expand Up @@ -793,9 +779,6 @@ static void __init omap_4430sdp_init(void)
package = OMAP_PACKAGE_CBL;
omap4_mux_init(board_mux, NULL, package);

omap_board_config = sdp4430_config;
omap_board_config_size = ARRAY_SIZE(sdp4430_config);

omap4_i2c_init();
omap_sfh7741prox_init();
platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));
Expand Down

0 comments on commit 0e782da

Please sign in to comment.