diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 10:04:50 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 10:04:50 +0000 |
commit | 2bb42693d59581b9540871184eeb199906dd48f9 (patch) | |
tree | 18e183d0a867d2a36c2f29750aa99974fb4f6ae1 /target/linux/x86/config-3.14 | |
parent | 9be4a77bf79040bce165d48251f17fe93d13557f (diff) | |
download | master-187ad058-2bb42693d59581b9540871184eeb199906dd48f9.tar.gz master-187ad058-2bb42693d59581b9540871184eeb199906dd48f9.tar.bz2 master-187ad058-2bb42693d59581b9540871184eeb199906dd48f9.zip |
x86: update to linux 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43559 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/config-3.14')
-rw-r--r-- | target/linux/x86/config-3.14 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/config-3.14 b/target/linux/x86/config-3.14 index 94be4254ad..f668e42933 100644 --- a/target/linux/x86/config-3.14 +++ b/target/linux/x86/config-3.14 @@ -116,7 +116,6 @@ CONFIG_GENERIC_IO=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y @@ -212,6 +211,7 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_INSTRUCTION_DECODER=y # CONFIG_INTEL_POWERCLAMP is not set # CONFIG_IOMMU_STRESS is not set +CONFIG_IOSF_MBI=m CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_NONE is not set |