aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-17 14:33:13 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-17 14:33:13 +0000
commitbddb1bb6d1beb8d3593ab3cddf27f2101816645b (patch)
tree0c29eae0a8239d8569734cdb86bee1a74e21b0d0
parentf70b78ddb485a3f24cf3df90cca273e9ba16010b (diff)
downloadupstream-bddb1bb6d1beb8d3593ab3cddf27f2101816645b.tar.gz
upstream-bddb1bb6d1beb8d3593ab3cddf27f2101816645b.tar.bz2
upstream-bddb1bb6d1beb8d3593ab3cddf27f2101816645b.zip
kernel: re-enable the firmware loader
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44481 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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