Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d31aae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft 

Pull iscsi_ibft fix from Konrad Rzeszutek Wilk:
 "One tiny fix to enable iSCSI IBFT to be compiled under ARM"

* 'for-linus-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: make ISCSI_IBFT depend on ACPI instead of ISCSI_IBFT_FIND
parents 6108cd47 94bccc34

drivers/firmware/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ config DMI_SCAN_MACHINE_NON_EFI_FALLBACK 


config ISCSI_IBFT_FIND

	bool "iSCSI Boot Firmware Table Attributes"

	depends on X86 && ACPI

	depends on X86 && ISCSI_IBFT

	default n

	help

	  This option enables the kernel to find the region of memory
@@ -168,7 +168,8 @@ config ISCSI_IBFT_FIND 
config ISCSI_IBFT

	tristate "iSCSI Boot Firmware Table Attributes module"

	select ISCSI_BOOT_SYSFS

	depends on ISCSI_IBFT_FIND && SCSI && SCSI_LOWLEVEL

	select ISCSI_IBFT_FIND if X86

	depends on ACPI && SCSI && SCSI_LOWLEVEL

	default	n

	help

	  This option enables support for detection and exposing of iSCSI

drivers/firmware/iscsi_ibft.c

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); 
MODULE_LICENSE("GPL");

MODULE_VERSION(IBFT_ISCSI_VERSION);



#ifndef CONFIG_ISCSI_IBFT_FIND

struct acpi_table_ibft *ibft_addr;

#endif



struct ibft_hdr {

	u8 id;

	u8 version;