summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2007-10-22 02:09:00 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-22 19:35:14 -0700
commite95d9c6b046f665da551a51b4071902336a6118c (patch)
tree3679aababf9c2df4456eb26cbad3e974d56c9698
parent81f8320f624a785d77443ace83391d0fdee695f6 (diff)
downloadop-kernel-dev-e95d9c6b046f665da551a51b4071902336a6118c.zip
op-kernel-dev-e95d9c6b046f665da551a51b4071902336a6118c.tar.gz
Expand hwif->host_flags so that it fits new flags.
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>
-rw-r--r--include/linux/ide.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2e4b8dd..4ed4777 100644
--- a/include/linux/ide.h
+++ b/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;
OpenPOWER on IntegriCloud