summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVirupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>2011-09-26 18:22:53 +0530
committerRabin VINCENT <rabin.vincent@stericsson.com>2011-09-27 09:33:01 +0200
commitdce93dd1cdd707a689668cb63aea631294caaf29 (patch)
tree75dfa4e151d7fc66efdc9e6d2921652c2a76a095
parent4500fc647f2853b01c82c6b3940b58b6009d9d5b (diff)
u5500_defconfig: Refresh the defconfig file
make ARCH=arm u5500_defconfig make ARCH=arm savedefconfig cp defconfig arch/arm/configs/u5500_defconfig git add arch/arm/configs/u5500_defconfig Change-Id: Icc525eaf6c6eb1a205be5f74e9a4881a5c20f9de Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31983 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
-rw-r--r--arch/arm/configs/u5500_defconfig37
1 files changed, 8 insertions, 29 deletions
diff --git a/arch/arm/configs/u5500_defconfig b/arch/arm/configs/u5500_defconfig
index 1a24b36604e..a40a3575676 100644
--- a/arch/arm/configs/u5500_defconfig
+++ b/arch/arm/configs/u5500_defconfig
@@ -58,7 +58,6 @@ CONFIG_UNIX=y
CONFIG_INET=y
# CONFIG_INET_LRO is not set
# CONFIG_IPV6 is not set
-CONFIG_BT=y
CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=y
@@ -67,7 +66,6 @@ CONFIG_BT_BNEP=y
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=y
-CONFIG_BT_HCIUART=y
CONFIG_COMPAT_WIRELESS=y
CONFIG_CFG80211=y
CONFIG_RFKILL=y
@@ -129,20 +127,13 @@ CONFIG_AB5500_CORE=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
CONFIG_REGULATOR_AB5500=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_FB=y
@@ -154,26 +145,15 @@ CONFIG_SOUND=y
CONFIG_SND=y
# CONFIG_SND_ARM is not set
# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
CONFIG_SND_SOC=y
CONFIG_SND_SOC_UX500=y
CONFIG_SND_SOC_U5500=y
-CONFIG_USB_MUSB_PERIPHERAL=y
CONFIG_SND_SOC_UX500_AB5500=y
-# CONFIG_USB is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG_WHITELIST is not set
-CONFIG_USB_MON=y
CONFIG_USB_MUSB_HDRC=y
CONFIG_USB_MUSB_UX500=y
-CONFIG_USB_MUSB_OTG=y
CONFIG_USB_GADGET_MUSB_HDRC=y
CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_MUSB_DEBUG=y
-CONFIG_USB_ACM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_LIBUSUAL=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_USB_G_ANDROID=y
@@ -203,6 +183,13 @@ CONFIG_ANDROID_RAM_CONSOLE=y
CONFIG_ANDROID_TIMED_GPIO=y
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
+CONFIG_CG2900=y
+CONFIG_CG2900_CHIP=y
+CONFIG_STLC2690_CHIP=y
+CONFIG_CG2900_UART=y
+CONFIG_CG2900_AUDIO=y
+CONFIG_CG2900_TEST=y
+CONFIG_BT_CG2900=y
CONFIG_U5500_MMIO=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
@@ -254,14 +241,6 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y
CONFIG_EARLY_PRINTK=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_CG2900=y
-CONFIG_CG2900_CHIP=y
-CONFIG_STLC2690_CHIP=y
-CONFIG_CG2900_UART=y
-CONFIG_CG2900_AUDIO=y
-CONFIG_CG2900_TEST=y
-CONFIG_BT_CG2900=y
CONFIG_KEYS=y
CONFIG_CRYPTO_MD5=m
CONFIG_CRYPTO_SHA1=m