Merge by hand (conflicts in sd.c)

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 */