2 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 0ab4493d3205..deb90a6a24e6 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -26,9 +26,6 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_TEGRA_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEASPM=y
-CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_MACH_CARDHU=y
 CONFIG_MACH_TEGRA_ENTERPRISE=y
 CONFIG_MACH_KAI=y
@@ -46,6 +43,8 @@ CONFIG_ARM_ERRATA_742230=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_ERRATA_751472=y
 CONFIG_ARM_ERRATA_752520=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
@@ -194,7 +193,6 @@ CONFIG_AD525X_DPOT_I2C=y
 CONFIG_APDS9802ALS=y
 CONFIG_SENSORS_NCT1008=y
 CONFIG_UID_STAT=y
-# CONFIG_BCM4329_RFKILL is not set
 CONFIG_TEGRA_CRYPTO_DEV=y
 CONFIG_MAX1749_VIBRATOR=y
 CONFIG_EEPROM_AT24=y
@@ -223,6 +221,7 @@ CONFIG_DM_UEVENT=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
 CONFIG_TUN=y
+CONFIG_R8169=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_BCM4329=m
 CONFIG_BCM4329_FIRST_SCAN=y
@@ -385,6 +384,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ACM=y
 CONFIG_USB_WDM=y
@@ -452,7 +452,6 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEBUG_FS=y
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHEDSTATS=y
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index 86d74c113a23..0739438d704a 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -27,9 +27,6 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_TEGRA_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIEASPM=y
-CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_MACH_CARDHU=y
 CONFIG_MACH_TEGRA_ENTERPRISE=y
 CONFIG_TEGRA_PWM=y
@@ -47,6 +44,8 @@ CONFIG_ARM_ERRATA_742230=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_ERRATA_751472=y
 CONFIG_ARM_ERRATA_752520=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
@@ -357,6 +356,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ACM=y
 CONFIG_USB_WDM=y