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 | 0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8 (patch) | |
tree | a354fbd7fc9eb3cb50d130f628a5d10a6f6a0644 /target/linux/x86/config-3.14 | |
parent | 363b166eb9ebf1b409d6699a11a29a1c10f52509 (diff) | |
download | upstream-0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8.tar.gz upstream-0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8.tar.bz2 upstream-0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8.zip |
x86: update to linux 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43559
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 |