aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2012-06-25 20:09:28 -0300
committerKevin Hilman <khilman@linaro.org>2015-05-12 16:02:14 -0700
commit291ed6a7c3f3dbda3dd27c19599972ef73ad2645 (patch)
tree3fcd0a2efa30e703198bfb4d2762279ff01922b2 /linaro
parentf406f5ed782ef9d83e75d6663295cc3f27803e8d (diff)
downloadlinux-linaro-stable-291ed6a7c3f3dbda3dd27c19599972ef73ad2645.tar.gz
configs: ubuntu: updating configs for 3.5
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Diffstat (limited to 'linaro')
-rw-r--r--linaro/configs/ubuntu.conf11
1 files changed, 1 insertions, 10 deletions
diff --git a/linaro/configs/ubuntu.conf b/linaro/configs/ubuntu.conf
index 04ef57a73588..202a0a2b68fc 100644
--- a/linaro/configs/ubuntu.conf
+++ b/linaro/configs/ubuntu.conf
@@ -23,7 +23,6 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y
# CONFIG_CGROUPS is not set
-CONFIG_RESOURCE_COUNTERS=y
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
@@ -32,7 +31,6 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
# CONFIG_SCHED_AUTOGROUP is not set
-CONFIG_MM_OWNER=y
CONFIG_RELAY=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
@@ -77,7 +75,6 @@ CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_THROTTLING=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_MSDOS_PARTITION=y
CONFIG_BSD_DISKLABEL=y
@@ -98,8 +95,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_HZ=128
CONFIG_AEABI=y
CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_ZONE_DMA_FLAG=0
@@ -458,9 +453,6 @@ CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
CONFIG_X25=m
CONFIG_LAPB=m
-CONFIG_ECONET=m
-CONFIG_ECONET_AUNUDP=y
-CONFIG_ECONET_NATIVE=y
CONFIG_WAN_ROUTER=m
CONFIG_PHONET=m
CONFIG_IEEE802154=m
@@ -623,6 +615,7 @@ CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_LIB80211_CRYPT_WEP=m
CONFIG_LIB80211_CRYPT_CCMP=m
CONFIG_LIB80211_CRYPT_TKIP=m
+CONFIG_MAC80211=m
CONFIG_MAC80211_MESH=y
CONFIG_MAC80211_LEDS=y
CONFIG_MAC80211_DEBUGFS=y
@@ -777,7 +770,6 @@ CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
-CONFIG_BMP085=m
CONFIG_USB_SWITCH_FSA9480=m
CONFIG_C2PORT=m
CONFIG_EEPROM_AT24=m
@@ -934,7 +926,6 @@ CONFIG_USB_ZD1201=m
CONFIG_USB_NET_RNDIS_WLAN=m
CONFIG_RTL8187=m
CONFIG_RTL8187_LEDS=y
-CONFIG_MAC80211_HWSIM=m
CONFIG_ATH_COMMON=m
CONFIG_ATH9K_HW=m
CONFIG_ATH9K_COMMON=m