diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-10-26 18:23:52 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-10-26 21:03:18 -0400 |
| commit | 34f9218fe519cd922889076cc7698bd73bdb9f92 (patch) | |
| tree | 50217145a1dd12d404471d7c32f1093ffdc916b7 /config-arm-omap-generic | |
| parent | 829bffe3f94cfbe50c418900af3d6eb9df27d59e (diff) | |
| download | kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.gz kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.tar.xz kernel-34f9218fe519cd922889076cc7698bd73bdb9f92.zip | |
Linux 3.1-git1 (138c4ae9cfda upstream)
First take on the upcomming Linux 3.2 kernel. The moving of the ethernet
drivers into vendor subdirectories caused a lot of churn in config-generic, but
hopefully it's a bit cleaner now.
Diffstat (limited to 'config-arm-omap-generic')
| -rw-r--r-- | config-arm-omap-generic | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/config-arm-omap-generic b/config-arm-omap-generic index e396169b3..ebfafa4af 100644 --- a/config-arm-omap-generic +++ b/config-arm-omap-generic @@ -133,6 +133,9 @@ CONFIG_ARM_GIC=y # CONFIG_PCCARD is not set CONFIG_SMP=y CONFIG_SMP_ON_UP=y +CONFIG_ARM_CPU_TOPOLOGY=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y CONFIG_HAVE_ARM_SCU=y CONFIG_HAVE_ARM_TWD=y CONFIG_NR_CPUS=2 @@ -290,6 +293,9 @@ CONFIG_EEPROM_93XX46=m CONFIG_DM_MULTIPATH=y # CONFIG_TARGET_CORE is not set # CONFIG_MACVTAP is not set +CONFIG_ETHERNET=y +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_NET_VENDOR_MICROCHIP=y CONFIG_MII=y # CONFIG_MARVELL_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -322,14 +328,13 @@ CONFIG_SMSC911X=y # CONFIG_DNET is not set # CONFIG_B44 is not set CONFIG_KS8851=m -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set # CONFIG_ATH9K_HTC is not set # CONFIG_AR9170_USB is not set # CONFIG_B43_SDIO is not set # CONFIG_B43_PHY_N is not set # CONFIG_HOSTAP is not set # CONFIG_IWM is not set +# CONFIG_BRCMDBG is not set CONFIG_LIBERTAS_SPI=m # CONFIG_LIBERTAS_MESH is not set CONFIG_P54_SPI=m @@ -489,6 +494,7 @@ CONFIG_GPIO_TWL4030=y # CONFIG_CHARGER_TWL4030 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_AD7314 is not set # CONFIG_SENSORS_AD7414 is not set # CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADCXX is not set @@ -886,6 +892,7 @@ CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_DEBUG_FS=y CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_R8A66597 is not set @@ -893,6 +900,7 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y +# CONFIG_USB_RENESAS_USBHS is not set # CONFIG_USB_ZERO is not set # CONFIG_USB_AUDIO is not set CONFIG_USB_ETH=y @@ -900,6 +908,7 @@ CONFIG_USB_ETH_RNDIS=y CONFIG_USB_ETH_EEM=y # CONFIG_USB_G_NCM is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_DWC3 is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_MASS_STORAGE is not set |