diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 12:16:23 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 12:16:23 +1100 |
commit | 540f74a50df0de3e2ab996f3d5d06cb7a54feb94 (patch) | |
tree | c0b17c2c8079bf1c08bc01f54f52c5afebae645c /drivers/ide/trm290.c | |
parent | 1198fa51e0242ba2686407e68f19455c9b20b72f (diff) | |
parent | 06b72de3e376dc2cc2c0735f27f0b791228d822e (diff) |
Merge branch 'quilt/ide'
Diffstat (limited to 'drivers/ide/trm290.c')
-rw-r--r-- | drivers/ide/trm290.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c index 75ea61526566..2a5ea90cf8b8 100644 --- a/drivers/ide/trm290.c +++ b/drivers/ide/trm290.c @@ -328,10 +328,10 @@ static struct ide_dma_ops trm290_dma_ops = { static const struct ide_port_info trm290_chipset __devinitdata = { .name = DRV_NAME, .init_hwif = init_hwif_trm290, - .chipset = ide_trm290, .port_ops = &trm290_port_ops, .dma_ops = &trm290_dma_ops, - .host_flags = IDE_HFLAG_NO_ATAPI_DMA | + .host_flags = IDE_HFLAG_TRM290 | + IDE_HFLAG_NO_ATAPI_DMA | #if 0 /* play it safe for now */ IDE_HFLAG_TRUST_BIOS_FOR_DMA | #endif |