summaryrefslogtreecommitdiff
path: root/chromeos/config/i386
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2012-06-26 17:45:26 -0400
committerSimone Willett <swillett@nvidia.com>2012-07-03 18:10:30 -0700
commit501339c55778f71876a37b697b0bd7110a706dff (patch)
tree2f7d7d699a9809328fba8d0d5e2dba2b158ce8f8 /chromeos/config/i386
parent2942cb6df3c5a5ca2c82786592643e83038ac053 (diff)
chromeos: update chromeos tegra3 split configs
Update split configs to enable the brcmfmac driver for wifi. Also renormalize the split configs. BUG=1007114 TEST=Using 6/20/2012 nightly image I was able to browse the web using wifi Signed-off-by: Rhyland Klein <rklein@nvidia.com> Change-Id: Ia810032861cf1015c3a0127cfa07f865a05e9028 Reviewed-on: http://git-master/r/111335 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Wei Ni <wni@nvidia.com> Reviewed-by: Allen Martin <amartin@nvidia.com>
Diffstat (limited to 'chromeos/config/i386')
-rw-r--r--chromeos/config/i386/config.common.i3865
1 files changed, 4 insertions, 1 deletions
diff --git a/chromeos/config/i386/config.common.i386 b/chromeos/config/i386/config.common.i386
index 8eb8362d12f4..a5a85733af59 100644
--- a/chromeos/config/i386/config.common.i386
+++ b/chromeos/config/i386/config.common.i386
@@ -362,6 +362,7 @@ CONFIG_LPC_SCH=m
# CONFIG_M586MMX is not set
# CONFIG_M586TSC is not set
CONFIG_M686=y
+# CONFIG_MAC80211_MESH is not set
# CONFIG_MACINTOSH_DRIVERS is not set
# CONFIG_MATH_EMULATION is not set
# CONFIG_MATOM is not set
@@ -481,6 +482,9 @@ CONFIG_PCIEAER=y
# CONFIG_PCIEAER_INJECT is not set
CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+# CONFIG_PCIEASPM_POWERSAVE is not set
CONFIG_PCIEPORTBUS=y
# CONFIG_PCIE_ECRC is not set
CONFIG_PCIE_PME=y
@@ -643,7 +647,6 @@ CONFIG_USB_NET_CDC_NCM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_MCS7830=m
CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_RNDIS_HOST=m
CONFIG_USB_NET_SMSC95XX=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set