aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-17 14:33:13 +0000
committerJohn Crispin <john@openwrt.org>2015-02-17 14:33:13 +0000
commitc2c2f64c666ba1700ff9828afe707c86abfe7a42 (patch)
tree3a97acc08ae1bc14f772786deef358f8ca4d84d7
parentc975f83cc21469ea9fc04124d5af127c960340f9 (diff)
downloadupstream-c2c2f64c666ba1700ff9828afe707c86abfe7a42.tar.gz
upstream-c2c2f64c666ba1700ff9828afe707c86abfe7a42.tar.bz2
upstream-c2c2f64c666ba1700ff9828afe707c86abfe7a42.zip
kernel: re-enable the firmware loader
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44481
-rw-r--r--target/linux/generic/config-3.183
-rw-r--r--target/linux/generic/config-3.193
2 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 5487bdd262..e8ae342613 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -1113,8 +1113,7 @@ CONFIG_FSNOTIFY=y
# CONFIG_FUSION_SPI is not set
CONFIG_FUTEX=y
CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_GACT_PROB=y
# CONFIG_GADGET_UAC1 is not set
# CONFIG_GAMEPORT is not set
diff --git a/target/linux/generic/config-3.19 b/target/linux/generic/config-3.19
index a5405f47ce..ae4030a010 100644
--- a/target/linux/generic/config-3.19
+++ b/target/linux/generic/config-3.19
@@ -1119,8 +1119,7 @@ CONFIG_FSNOTIFY=y
# CONFIG_FUSION_SPI is not set
CONFIG_FUTEX=y
CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_GACT_PROB=y
# CONFIG_GADGET_UAC1 is not set
# CONFIG_GAMEPORT is not set