diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 10:39:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 10:39:00 -0700 |
| commit | 4843a3baf20059a7ac5b55582672705d9e61e274 (patch) | |
| tree | 15a4a67b1c929493896d9cfca02ef079f6267e17 | |
| parent | cb4cbcf6b3cf79f80c157afdc8dd8221643d8481 (diff) | |
| parent | e01698aed04811b9a9c4f8d54b73cb182757063d (diff) | |
| download | linux-4843a3baf20059a7ac5b55582672705d9e61e274.tar.bz2 | |
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.
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | drivers/ide/cmd64x.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 02f6f78b561f..5ef3a16eb140 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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/ diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c index 03c86209446f..680e5975217f 100644 --- a/drivers/ide/cmd64x.c +++ b/drivers/ide/cmd64x.c @@ -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, |