diff options
| author | Yann Gautier <yann.gautier@stericsson.com> | 2011-09-21 15:24:48 +0200 |
|---|---|---|
| committer | Yann GAUTIER <yann.gautier@stericsson.com> | 2011-09-22 09:12:11 +0200 |
| commit | eaaaf7601e30035b7caae411c25b864a395646ac (patch) | |
| tree | 8ebe11742a1cc93b4c3f8c8ea74637910edd5fe1 | |
| parent | e8cf97b18a85fb536a488ac2aa241a6f9298f106 (diff) | |
Align u9500_defconfig on 8500
Change-Id: I288ea800be0a6acf7b31a4e247a0dd703ab97277
Change-Id: Iae584f8558f571952c6805ba3788f7241db70636
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31536
Reviewed-by: Yann GAUTIER <yann.gautier@stericsson.com>
Tested-by: Yann GAUTIER <yann.gautier@stericsson.com>
Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com>
| -rwxr-xr-x | arch/arm/configs/u9500_defconfig | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/configs/u9500_defconfig b/arch/arm/configs/u9500_defconfig index 847014ba001..66a6e1b2722 100755 --- a/arch/arm/configs/u9500_defconfig +++ b/arch/arm/configs/u9500_defconfig @@ -79,6 +79,7 @@ CONFIG_IPV6=y # CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_MODE_BEET is not set # CONFIG_IPV6_SIT is not set +# CONFIG_ANDROID_PARANOID_NETWORK is not set CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y @@ -146,7 +147,7 @@ CONFIG_MISC_DEVICES=y CONFIG_AB8500_PWM=y CONFIG_SENSORS_BH1780=y CONFIG_STE_TRACE_MODEM=y -CONFIG_STM_TRACE=y +# CONFIG_STM_TRACE=y CONFIG_DISPDEV=y # CONFIG_STE_AUDIO_IO_DEV is not set CONFIG_SCSI=y @@ -204,7 +205,7 @@ CONFIG_GPIO_TC3589X=y CONFIG_GPIO_AB8500=y CONFIG_POWER_SUPPLY=y CONFIG_AB8500_BM=y -CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y +CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=n CONFIG_AB5500_BM=y CONFIG_AB5500_BATTERY_THERM_ON_BATCTRL=y CONFIG_SENSORS_AB8500=y @@ -221,8 +222,17 @@ CONFIG_REGULATOR_VIRTUAL_CONSUMER=y CONFIG_REGULATOR_AB8500=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_COMMON=y +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_MEDIA=y +CONFIG_MEDIA_TUNER=y # CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y # CONFIG_VIDEO_CAPTURE_DRIVERS is not set +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_CG2900=y CONFIG_GPU_MALI=y CONFIG_GPU_MALI_DEBUG=y CONFIG_FB=y |