summaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/sun3_defconfig
diff options
context:
space:
mode:
authorBenjamin Gilbert <benjamin.gilbert@coreos.com>2018-01-24 03:06:31 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-25 12:46:30 +0100
commit7f55c733b6607d6bfc16057641f18280e587cca8 (patch)
tree0775169765596edcfe87cdfbcd0d0b953709d4ea /arch/m68k/configs/sun3_defconfig
parentUSB: serial: keyspan: Drop firmware Kconfig options (diff)
downloadlinux-7f55c733b6607d6bfc16057641f18280e587cca8.tar.xz
linux-7f55c733b6607d6bfc16057641f18280e587cca8.zip
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/m68k/configs/sun3_defconfig')
-rw-r--r--arch/m68k/configs/sun3_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index d1cb7a04ae1d..5aef62938f32 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -306,7 +306,6 @@ CONFIG_NET_DEVLINK=m
# CONFIG_UEVENT_HELPER is not set
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
CONFIG_CONNECTOR=m
CONFIG_BLK_DEV_LOOP=y