diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-17 23:45:27 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:00:03 -0500 |
commit | 256a32eacf74681631ee7d17c5863f023e3ba402 (patch) | |
tree | ea3d8d8bfb3b7922594b26a7eaf68659ce5ea750 | |
parent | 64c4e9f8988e6974ee7cae569fa500e7e673837b (diff) |
arm/tegra: refresh defconfig for tegra30
Update the defconfig for tegra due to the addition of tegra30 and rename
of t20/t30 options.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r-- | arch/arm/configs/tegra_defconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 195729760aeb..fd5d3041d717 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig | |||
@@ -9,9 +9,8 @@ CONFIG_RESOURCE_COUNTERS=y | |||
9 | CONFIG_CGROUP_SCHED=y | 9 | CONFIG_CGROUP_SCHED=y |
10 | CONFIG_RT_GROUP_SCHED=y | 10 | CONFIG_RT_GROUP_SCHED=y |
11 | CONFIG_BLK_DEV_INITRD=y | 11 | CONFIG_BLK_DEV_INITRD=y |
12 | CONFIG_EMBEDDED=y | ||
13 | # CONFIG_SYSCTL_SYSCALL is not set | ||
14 | # CONFIG_ELF_CORE is not set | 12 | # CONFIG_ELF_CORE is not set |
13 | CONFIG_EMBEDDED=y | ||
15 | CONFIG_SLAB=y | 14 | CONFIG_SLAB=y |
16 | CONFIG_MODULES=y | 15 | CONFIG_MODULES=y |
17 | CONFIG_MODULE_UNLOAD=y | 16 | CONFIG_MODULE_UNLOAD=y |
@@ -20,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
20 | # CONFIG_IOSCHED_DEADLINE is not set | 19 | # CONFIG_IOSCHED_DEADLINE is not set |
21 | # CONFIG_IOSCHED_CFQ is not set | 20 | # CONFIG_IOSCHED_CFQ is not set |
22 | CONFIG_ARCH_TEGRA=y | 21 | CONFIG_ARCH_TEGRA=y |
22 | CONFIG_ARCH_TEGRA_2x_SOC=y | ||
23 | CONFIG_ARCH_TEGRA_3x_SOC=y | ||
23 | CONFIG_MACH_HARMONY=y | 24 | CONFIG_MACH_HARMONY=y |
24 | CONFIG_MACH_KAEN=y | 25 | CONFIG_MACH_KAEN=y |
25 | CONFIG_MACH_PAZ00=y | 26 | CONFIG_MACH_PAZ00=y |
@@ -78,14 +79,12 @@ CONFIG_BLK_DEV_SD=y | |||
78 | # CONFIG_SCSI_LOWLEVEL is not set | 79 | # CONFIG_SCSI_LOWLEVEL is not set |
79 | CONFIG_NETDEVICES=y | 80 | CONFIG_NETDEVICES=y |
80 | CONFIG_DUMMY=y | 81 | CONFIG_DUMMY=y |
81 | CONFIG_NET_ETHERNET=y | ||
82 | CONFIG_R8169=y | 82 | CONFIG_R8169=y |
83 | # CONFIG_NETDEV_10000 is not set | ||
84 | # CONFIG_WLAN is not set | ||
85 | CONFIG_USB_PEGASUS=y | 83 | CONFIG_USB_PEGASUS=y |
86 | CONFIG_USB_USBNET=y | 84 | CONFIG_USB_USBNET=y |
87 | CONFIG_USB_NET_SMSC75XX=y | 85 | CONFIG_USB_NET_SMSC75XX=y |
88 | CONFIG_USB_NET_SMSC95XX=y | 86 | CONFIG_USB_NET_SMSC95XX=y |
87 | # CONFIG_WLAN is not set | ||
89 | # CONFIG_INPUT is not set | 88 | # CONFIG_INPUT is not set |
90 | # CONFIG_SERIO is not set | 89 | # CONFIG_SERIO is not set |
91 | # CONFIG_VT is not set | 90 | # CONFIG_VT is not set |