diff --git a/[refs] b/[refs] index c881460fea37..34f599604a13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81f8320f624a785d77443ace83391d0fdee695f6 +refs/heads/master: e95d9c6b046f665da551a51b4071902336a6118c diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index 2e4b8dd03cfe..4ed4777bba67 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -667,7 +667,7 @@ typedef struct hwif_s { u8 straight8; /* Alan's straight 8 check */ u8 bus_state; /* power state of the IDE bus */ - u16 host_flags; + u32 host_flags; u8 pio_mask;