summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra_defconfig8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 38b9e4daa933..7383ec582794 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36.3
-# Thu Feb 3 15:55:53 2011
+# Mon Feb 14 14:37:14 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -939,6 +939,7 @@ CONFIG_SENSORS_NCT1008=y
# CONFIG_APANIC is not set
CONFIG_BCM4329_RFKILL=y
CONFIG_TEGRA_CRYPTO_DEV=y
+# CONFIG_MAX1749_VIBRATOR is not set
# CONFIG_C2PORT is not set
#
@@ -1382,6 +1383,7 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_ADM1031 is not set
# CONFIG_SENSORS_ADM9240 is not set
# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7461 is not set
# CONFIG_SENSORS_ADT7462 is not set
# CONFIG_SENSORS_ADT7470 is not set
# CONFIG_SENSORS_ADT7475 is not set
@@ -1684,6 +1686,7 @@ CONFIG_TEGRA_ALSA=y
CONFIG_TEGRA_PCM=y
CONFIG_TEGRA_I2S=y
CONFIG_TEGRA_IEC=y
+CONFIG_TEGRA_GENERIC_CODEC=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
# CONFIG_SND_SOC_WM8753 is not set
@@ -1925,7 +1928,8 @@ CONFIG_USB_ANDROID=y
CONFIG_USB_ANDROID_ADB=y
CONFIG_USB_ANDROID_MASS_STORAGE=y
CONFIG_USB_ANDROID_MTP=y
-# CONFIG_USB_ANDROID_RNDIS is not set
+CONFIG_USB_ANDROID_RNDIS=y
+# CONFIG_USB_ANDROID_RNDIS_WCEIS is not set
# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_G_MULTI is not set
# CONFIG_USB_G_HID is not set