diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 11:25:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 11:25:58 -0700 |
| commit | 5abd9ccced7a726c817dd6b5b96bc933859138d1 (patch) | |
| tree | 52b4612b5fb54f00364eadf39e0155209498e5d9 /include/linux/iscsi_ibft.h | |
| parent | d5fc1d517543857ea117fc57f23b394aa9784f06 (diff) | |
| parent | 57a5f3c99c99f70f8fdfa0bbc83b98c48f56551a (diff) | |
| download | op-kernel-dev-5abd9ccced7a726c817dd6b5b96bc933859138d1.zip op-kernel-dev-5abd9ccced7a726c817dd6b5b96bc933859138d1.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
ibft: Use IBFT_SIGN instead of open-coding the search string.
ibft: convert iscsi_ibft module to iscsi boot lib
ibft: separate ibft parsing from sysfs interface
ibft: For UEFI machines actually do scan ACPI for iBFT.
ibft: Update iBFT handling for v1.03 of the spec.
Diffstat (limited to 'include/linux/iscsi_ibft.h')
| -rw-r--r-- | include/linux/iscsi_ibft.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/linux/iscsi_ibft.h b/include/linux/iscsi_ibft.h index d2e4042..8ba7e5b 100644 --- a/include/linux/iscsi_ibft.h +++ b/include/linux/iscsi_ibft.h @@ -21,21 +21,13 @@ #ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -struct ibft_table_header { - char signature[4]; - u32 length; - u8 revision; - u8 checksum; - char oem_id[6]; - char oem_table_id[8]; - char reserved[24]; -} __attribute__((__packed__)); +#include <acpi/acpi.h> /* * Logical location of iSCSI Boot Format Table. * If the value is NULL there is no iBFT on the machine. */ -extern struct ibft_table_header *ibft_addr; +extern struct acpi_table_ibft *ibft_addr; /* * Routine used to find and reserve the iSCSI Boot Format Table. The |
