diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:15:31 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:15:31 +0100 |
commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /drivers/scsi/pm8001/pm8001_hwi.h | |
parent | ALSA: cs46xx - Fix suspend/resume with new DSP (diff) | |
parent | ALSA: Fix indentation in pcm_native.c (diff) | |
download | linux-52e04ea89da57274f0313d2bd73ba02f686cfdeb.tar.xz linux-52e04ea89da57274f0313d2bd73ba02f686cfdeb.zip |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_hwi.h')
-rw-r--r-- | drivers/scsi/pm8001/pm8001_hwi.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/pm8001/pm8001_hwi.h b/drivers/scsi/pm8001/pm8001_hwi.h index 96e4daa68b8f..833a5201eda4 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.h +++ b/drivers/scsi/pm8001/pm8001_hwi.h @@ -242,8 +242,7 @@ struct reg_dev_req { __le32 phyid_portid; __le32 dtype_dlr_retry; __le32 firstburstsize_ITNexustimeout; - u32 sas_addr_hi; - u32 sas_addr_low; + u8 sas_addr[SAS_ADDR_SIZE]; __le32 upper_device_id; u32 reserved[8]; } __attribute__((packed, aligned(4))); |