]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Expand hwif->host_flags so that it fits new flags.
authorDavid Miller <davem@davemloft.net>
Mon, 22 Oct 2007 09:09:00 +0000 (02:09 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:35:14 +0000 (19:35 -0700)
Commit 238e4f142c33bb34440cc64029dde7b9fbc4e65f ("ide: add
IDE_HFLAG_NO_LBA48 and IDE_HFLAG_NO_LBA48_DMA host flags") caused a
regression because the host_flags in struct hwif_s wasn't expanded to
cope with the fact that the host flags no longer fit in 16 bits.

Signed-off-by: David S. Miller <davem@davemloft.net>
[ I hate having to add good commit descriptions.  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/ide.h

index 2e4b8dd03cfe79413f9a5a2d75b3754863781a12..4ed4777bba67abcd5ecba17bb3c8c2ca19e999f9 100644 (file)
@@ -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;