aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-18 18:30:07 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-18 18:30:07 -0400
commit238e4f142c33bb34440cc64029dde7b9fbc4e65f (patch)
tree5fc96f650cf6d326a4bc1e0026cd8ddeb9b9aa94 /include/linux
parent9ffcf364f9d0aca3ea79e9987c368eb75925460e (diff)
ide: add IDE_HFLAG_NO_LBA48 and IDE_HFLAG_NO_LBA48_DMA host flags
Add IDE_HFLAG_NO_LBA48[_DMA] host flags, use it instead of hwif->no_lba48[_dma] and then remove no longer needed hwif->no_lba48[_dma]. As a side-effect this change fixes hwif->no_lba48_dma not being restored by ide_hwif_restore(). Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index b721f0b379f6..dced2e176d9f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -796,8 +796,6 @@ typedef struct hwif_s {
796 unsigned serialized : 1; /* serialized all channel operation */ 796 unsigned serialized : 1; /* serialized all channel operation */
797 unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */ 797 unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */
798 unsigned reset : 1; /* reset after probe */ 798 unsigned reset : 1; /* reset after probe */
799 unsigned no_lba48 : 1; /* 1 = cannot do LBA48 */
800 unsigned no_lba48_dma : 1; /* 1 = cannot do LBA48 DMA */
801 unsigned auto_poll : 1; /* supports nop auto-poll */ 799 unsigned auto_poll : 1; /* supports nop auto-poll */
802 unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */ 800 unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */
803 unsigned no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */ 801 unsigned no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */
@@ -1254,6 +1252,10 @@ enum {
1254 IDE_HFLAG_NO_AUTODMA = (1 << 15), 1252 IDE_HFLAG_NO_AUTODMA = (1 << 15),
1255 /* host is CS5510/CS5520 */ 1253 /* host is CS5510/CS5520 */
1256 IDE_HFLAG_CS5520 = (1 << 16), 1254 IDE_HFLAG_CS5520 = (1 << 16),
1255 /* no LBA48 */
1256 IDE_HFLAG_NO_LBA48 = (1 << 17),
1257 /* no LBA48 DMA */
1258 IDE_HFLAG_NO_LBA48_DMA = (1 << 18),
1257}; 1259};
1258 1260
1259#ifdef CONFIG_BLK_DEV_OFFBOARD 1261#ifdef CONFIG_BLK_DEV_OFFBOARD