Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4843a3ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents cb4cbcf6 e01698ae

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -2824,10 +2824,10 @@ S: Supported 
F:	drivers/scsi/ips.*



IDE SUBSYSTEM

P:	Bartlomiej Zolnierkiewicz

M:	bzolnier@gmail.com

P:	David S. Miller

M:	davem@davemloft.net

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

F:	Documentation/ide/

F:	drivers/ide/

drivers/ide/cmd64x.c

+1 −2
Original line number Diff line number Diff line
@@ -389,8 +389,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_cmd64x,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.port_ops	= &cmd648_port_ops,

		.host_flags	= IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_ABUSE_PREFETCH,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA2,