aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-07-19 17:12:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-07-19 17:12:34 +0000
commit1e16a6c70119e8341f9e17d2b70d212710ac0014 (patch)
treea3683ddea12f0fa6f5d195085f1731d3ec092cfc /target
parenta694663add70a2faa5bdaea58fe8d24bc8bff5a9 (diff)
downloadmaster-187ad058-1e16a6c70119e8341f9e17d2b70d212710ac0014.tar.gz
master-187ad058-1e16a6c70119e8341f9e17d2b70d212710ac0014.tar.bz2
master-187ad058-1e16a6c70119e8341f9e17d2b70d212710ac0014.zip
kernel: refresh config-3.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37449 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/config-3.104
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10
index 2f7cd500f7..95022e40f1 100644
--- a/target/linux/generic/config-3.10
+++ b/target/linux/generic/config-3.10
@@ -1561,6 +1561,7 @@ CONFIG_LZMA_DECOMPRESS=y
# CONFIG_MAILBOX is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MCPM is not set
# CONFIG_MD is not set
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_BUS_MUX_GPIO is not set
@@ -1717,7 +1718,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MOUSE_PS2_SENTELIC is not set
# CONFIG_MOUSE_SYNAPTICS_I2C is not set
# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_MCPM is not set
# CONFIG_MSDOS_FS is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -3257,8 +3257,8 @@ CONFIG_TEXTSEARCH=y
# CONFIG_THERMAL is not set
# CONFIG_THERMAL_HWMON is not set
# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_TICK_ONESHOT=y
# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_ONESHOT=y
# CONFIG_TIFM_CORE is not set
# CONFIG_TIGON3 is not set
# CONFIG_TIMB_DMA is not set