diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:36:26 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:41 +0200 |
| commit | 24cbb81f258b017de58ba488d6a6ecf9069aef7e (patch) | |
| tree | 8713ab682b667f6180e43b19dbb23b73242739f2 /arch/arm/mach-ux500/board-mop500.c | |
| parent | 78795d7a2a52afca3e80ecb94ca4022ce2364bf6 (diff) | |
mach-ux500: Fix merge problems and changes for 3.0
Must be cleaned!!
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index b7c5375fbf5..12e0ed4a887 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -876,9 +876,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, &snowball_sbnet_dev, - &ab8500_device, +//EROBEMA &ab8500_device, &snowball_gpio_wlan_vbat_regulator_device, - &ux500_hwmem_device, &u8500_mcde_device, &u8500_b2r2_device, }; @@ -889,10 +888,12 @@ static struct platform_device *snowball_platform_devs[] __initdata = { */ static void accessory_detect_config(void) { +#ifdef CONFIG_INPUT_AB8500_ACCDET if (machine_is_hrefv60()) ab8500_accdet_pdata.is_detection_inverted = true; else ab8500_accdet_pdata.is_detection_inverted = false; +#endif } static void __init mop500_init_machine(void) |