[ARM] harmony: disable ANDROID_PARANOID_NETWORK, enable ALSA

Change-Id: I7d9bc94317f1c069f124cd9889c27ce22578e50e
Reviewed-on: http://git-master/r/2577
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>

1 files changed, 39 insertions, 20 deletions

diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
index 46ecb1885c45..fe23d821e1d2 100644
--- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.9
-# Fri May 28 17:14:59 2010
+# Tue Jun 15 10:55:27 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -224,8 +224,8 @@ CONFIG_TEGRA_IOVMM=y
 CONFIG_TEGRA_NVEC=y
 CONFIG_TEGRA_PCI=y
 CONFIG_TEGRA_FUSE=y
+# CONFIG_TEGRA_AES is not set
 # CONFIG_TEGRA_USB_CHARGE is not set
-# CONFIG_TEGRA_ODM_VIBRATE is not set
 CONFIG_TEGRA_ODM_HARMONY=y
 # CONFIG_TEGRA_ODM_WHISTLER is not set
 
@@ -432,7 +432,7 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
-# CONFIG_ANDROID_PARANOID_NETWORK=y
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
@@ -1244,7 +1244,39 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_LOGO is not set
-# CONFIG_SOUND is not set
+CONFIG_SOUND=y
+# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_JACK=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+# CONFIG_SND_RAWMIDI_SEQ is not set
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_PCI is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_TEGRA_SND_SOC=y
+CONFIG_TEGRA_PCM=y
+CONFIG_TEGRA_I2S=y
+CONFIG_TEGRA_GENERIC_CODEC=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 CONFIG_HIDRAW=y
@@ -1431,11 +1463,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_ANDROID=y
-# CONFIG_USB_ANDROID_ACM is not set
-# CONFIG_USB_ANDROID_ADB=y
-# CONFIG_USB_ANDROID_MASS_STORAGE=y
-# CONFIG_USB_ANDROID_RNDIS is not set
+# CONFIG_USB_ANDROID is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
 
 #
@@ -1571,16 +1599,7 @@ CONFIG_STAGING=y
 #
 # Android
 #
-# CONFIG_ANDROID=y
-# CONFIG_ANDROID_BINDER_IPC=y
-# CONFIG_ANDROID_LOGGER=y
-# CONFIG_ANDROID_RAM_CONSOLE=y
-# CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
-# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
-# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
-# CONFIG_ANDROID_TIMED_OUTPUT=y
-# CONFIG_ANDROID_TIMED_GPIO=y
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+# CONFIG_ANDROID is not set
 
 #
 # Qualcomm MSM Camera And Video
@@ -1591,6 +1610,7 @@ CONFIG_STAGING=y
 #
 # CONFIG_POHMELFS is not set
 # CONFIG_B3DFG is not set
+# CONFIG_LINE6_USB is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_FB_UDL is not set
@@ -1868,4 +1888,3 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_NLATTR=y
-