android_origin_defconfig: Fix build issuelinux-linaro-3.2-2012.01-0-android-0

The origin_defconfig was having ipv6 build issues, so correct that
and update defconfig via savedefconfig

Signed-off-by: John Stultz <john.stultz@linaro.org>

1 files changed, 5 insertions, 20 deletions

diff --git a/arch/arm/configs/android_origen_defconfig b/arch/arm/configs/android_origen_defconfig
index fa721c1faab7..6d6f17d5cc3c 100644
--- a/arch/arm/configs/android_origen_defconfig
+++ b/arch/arm/configs/android_origen_defconfig
@@ -7,7 +7,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_KALLSYMS_ALL=y
-# Android Anonymous Shared Memory
 CONFIG_ASHMEM=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_COUNTERS=y
@@ -38,13 +37,13 @@ CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=2
 CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_CMDLINE="root=/dev/mmcblk0p1 rw rootwait console=ttySAC2,115200"
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="root=/dev/mmcblk0p1 rw rootwait console=ttySAC2,115200"
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -57,6 +56,7 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
+# CONFIG_IPV6 is not set
 CONFIG_CFG80211=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_GPIO=y
@@ -75,13 +75,10 @@ CONFIG_USB_NET_MCS7830=y
 CONFIG_ATH_COMMON=y
 CONFIG_ATH_DEBUG=y
 CONFIG_ATH6KL=m
-CONFIG_ATH6KL_PLATFORM_DATA=y
-CONFIG_ATH6KL_POLL=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_UNIDISPLAY_TS=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_SAMSUNG=y
@@ -89,7 +86,6 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_I2C=y
 CONFIG_I2C_S3C2410=y
-# Android Virtual Battery Support
 CONFIG_W1=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_HWMON is not set
@@ -103,11 +99,10 @@ CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_SAMSUNG_S5P_TV=y
 CONFIG_VIDEO_SAMSUNG_S5P_HDMI=y
 CONFIG_VIDEO_SAMSUNG_S5P_SDO=y
-CONFIG_ION=y
 CONFIG_VIDEO_SAMSUNG_S5P_MIXER=y
+CONFIG_ION=y
 CONFIG_FB=y
 CONFIG_FB_S3C=y
-CONFIG_FB_S3C_NR_BUFFERS=2
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
@@ -121,20 +116,12 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_SAMSUNG=y
-CONFIG_SND_SOC_ORIGEN_RT5625=y
 CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_S5P=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_EXYNOS=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_S3C_OTGD=y
-CONFIG_USB_S3C_OTGD=y
-CONFIG_USB_GADGET_S3C_OTGD_DMA_MODE=y
-# CONFIG_USB_GADGET_S3C_OTGD_SLAVE_MODE is not set
-CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FUNCTIONFS=m
@@ -152,13 +139,12 @@ CONFIG_MMC_SDHCI_S3C=y
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_S3C=y
-CONFIG_ANDROID=y
 CONFIG_STAGING=y
+CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_LOGGER=y
 CONFIG_ANDROID_RAM_CONSOLE=y
 CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT=y
-CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_EXT2_FS=y
@@ -178,7 +164,6 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_SPINLOCK=y