diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-07-19 17:12:34 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-07-19 17:12:34 +0000 |
| commit | 8e674fdf1b2f65aea3517d9ccf5feaa7bf7a9a4f (patch) | |
| tree | bba65646f18334eb308b53617553976f8e14f548 | |
| parent | ddb0804479c7daf3bd693cb9a92398a15702a372 (diff) | |
| download | upstream-8e674fdf1b2f65aea3517d9ccf5feaa7bf7a9a4f.tar.gz upstream-8e674fdf1b2f65aea3517d9ccf5feaa7bf7a9a4f.tar.bz2 upstream-8e674fdf1b2f65aea3517d9ccf5feaa7bf7a9a4f.zip | |
kernel: refresh config-3.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37449
| -rw-r--r-- | target/linux/generic/config-3.10 | 4 |
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 |