Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide cmd64x: Remove serialize setting. ide: Take over as maintainer.
This commit is contained in:
Коммит
4843a3baf2
|
@ -2824,10 +2824,10 @@ S: Supported
|
||||||
F: drivers/scsi/ips.*
|
F: drivers/scsi/ips.*
|
||||||
|
|
||||||
IDE SUBSYSTEM
|
IDE SUBSYSTEM
|
||||||
P: Bartlomiej Zolnierkiewicz
|
P: David S. Miller
|
||||||
M: bzolnier@gmail.com
|
M: davem@davemloft.net
|
||||||
L: linux-ide@vger.kernel.org
|
L: linux-ide@vger.kernel.org
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/ide/
|
F: Documentation/ide/
|
||||||
F: drivers/ide/
|
F: drivers/ide/
|
||||||
|
|
|
@ -389,8 +389,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
|
||||||
.init_chipset = init_chipset_cmd64x,
|
.init_chipset = init_chipset_cmd64x,
|
||||||
.enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
|
.enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
|
||||||
.port_ops = &cmd648_port_ops,
|
.port_ops = &cmd648_port_ops,
|
||||||
.host_flags = IDE_HFLAG_SERIALIZE |
|
.host_flags = IDE_HFLAG_ABUSE_PREFETCH,
|
||||||
IDE_HFLAG_ABUSE_PREFETCH,
|
|
||||||
.pio_mask = ATA_PIO5,
|
.pio_mask = ATA_PIO5,
|
||||||
.mwdma_mask = ATA_MWDMA2,
|
.mwdma_mask = ATA_MWDMA2,
|
||||||
.udma_mask = ATA_UDMA2,
|
.udma_mask = ATA_UDMA2,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче