Commit 552d6ba2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-6.1-final' of... 

Merge tag 'fpga-for-6.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga

 into work-linus

Xu writes:

FPGA Manager changes for 6.1-final

Intel m10 bmc secure update

- Russ's change fixes Kconfig dependencies

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-6.1 branch)

Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: m10bmc-sec: Fix kconfig dependencies
parents eb708140 dfd10332

drivers/fpga/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -246,7 +246,9 @@ config FPGA_MGR_VERSAL_FPGA 


config FPGA_M10_BMC_SEC_UPDATE

	tristate "Intel MAX10 BMC Secure Update driver"

	depends on MFD_INTEL_M10_BMC && FW_UPLOAD

	depends on MFD_INTEL_M10_BMC

	select FW_LOADER

	select FW_UPLOAD

	help

	  Secure update support for the Intel MAX10 board management

	  controller.