Commit 7f55c733 authored by Benjamin Gilbert's avatar Benjamin Gilbert Committed by Greg Kroah-Hartman
Browse files

firmware: Drop FIRMWARE_IN_KERNEL Kconfig option 



It doesn't actually do anything.  Merge its help text into
EXTRA_FIRMWARE.

Fixes: 5620a0d1 ("firmware: delete in-kernel firmware")
Fixes: 0946b2fb ("firmware: cleanup FIRMWARE_IN_KERNEL message")
Signed-off-by: default avatarBenjamin Gilbert <benjamin.gilbert@coreos.com>
Signed-off-by: default avatarRobin H. Johnson <robbat2@gentoo.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 003948c5

arch/arc/configs/axs101_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y 
CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

arch/arc/configs/axs103_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y 
CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

arch/arc/configs/axs103_smp_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y 
CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

arch/arc/configs/haps_hs_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ CONFIG_INET=y 
CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

arch/arc/configs/haps_hs_smp_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ CONFIG_INET=y 
CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE