summary refs log tree commit diff
path: root/arch/s390/configs
diff options
context:
space:
mode:
authorBenjamin Gilbert <benjamin.gilbert@coreos.com>2018-01-23 18:06:31 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-25 12:46:30 +0100
commit7f55c733b6607d6bfc16057641f18280e587cca8 (patch)
tree0775169765596edcfe87cdfbcd0d0b953709d4ea /arch/s390/configs
parent003948c54e5b5034a9bbb4923336f5aba125eae6 (diff)
downloadlinux-7f55c733b6607d6bfc16057641f18280e587cca8.tar.gz
firmware: Drop FIRMWARE_IN_KERNEL Kconfig option
It doesn't actually do anything.  Merge its help text into
EXTRA_FIRMWARE.

Fixes: 5620a0d1aacd ("firmware: delete in-kernel firmware")
Fixes: 0946b2fb38fd ("firmware: cleanup FIRMWARE_IN_KERNEL message")
Signed-off-by: Benjamin Gilbert <benjamin.gilbert@coreos.com>
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/configs')
-rw-r--r--arch/s390/configs/zfcpdump_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig
index 04e042edbab7..7dc7f58c4287 100644
--- a/arch/s390/configs/zfcpdump_defconfig
+++ b/arch/s390/configs/zfcpdump_defconfig
@@ -26,7 +26,6 @@ CONFIG_NET=y
 # CONFIG_IUCV is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_BLK_DEV_RAM=y
 # CONFIG_BLK_DEV_XPRAM is not set
 # CONFIG_DCSSBLK is not set