diff --git a/[refs] b/[refs]
index c4af684d0b8c..518b40764b68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e62925dd26ef9594b8e4b9380b3211f6dae4ab96
+refs/heads/master: 3071a9d00b8684899d93f368e670c4de0293df29
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index ecaa96e613dc..6f5b6b5e9c1d 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -1111,7 +1111,7 @@ struct ide_port_info {
 	void			(*fixup)(ide_hwif_t *);
 	ide_pci_enablebit_t	enablebits[2];
 	hwif_chipset_t		chipset;
-	unsigned int		extra;
+	u8			extra;
 	u32			host_flags;
 	u8			pio_mask;
 	u8			swdma_mask;