diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-09-06 17:52:54 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-09-06 17:52:54 -0500 |
| commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
| tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /drivers/message/fusion/mptbase.h | |
| parent | 3173d8c342971a03857d8af749a3f57da7d06b57 (diff) | |
| parent | fe1b2d544d71300f8e2d151c3c77a130d13a58be (diff) | |
| download | blackbird-op-linux-17fa53da1239b8712c5cebbd72a74c713b6c2db9.tar.gz blackbird-op-linux-17fa53da1239b8712c5cebbd72a74c713b6c2db9.zip | |
Merge by hand (conflicts in sd.c)
Diffstat (limited to 'drivers/message/fusion/mptbase.h')
| -rw-r--r-- | drivers/message/fusion/mptbase.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index 848fb236b175..f4827d923731 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h @@ -915,7 +915,10 @@ struct scsi_cmnd; typedef struct _x_config_parms { struct list_head linkage; /* linked list */ struct timer_list timer; /* timer function for this request */ - ConfigPageHeader_t *hdr; + union { + ConfigExtendedPageHeader_t *ehdr; + ConfigPageHeader_t *hdr; + } cfghdr; dma_addr_t physAddr; int wait_done; /* wait for this request */ u32 pageAddr; /* properly formatted */ |
