diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-25 20:21:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-25 20:21:57 -0800 |
| commit | 11ee29577cc1637f94d903a6ea322cf1ed8ce1b3 (patch) | |
| tree | c26f34df84f184efe9d5e6d9e657b1fe8b598470 /drivers/ide/pci | |
| parent | c2f68ad3b59d7015bf6fb0037ee0b5f2331aed28 (diff) | |
| parent | deffca117b90dadec395c0cf3ee816de27dfe2fd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
cmd64x: fix hwif->chipset setup
MAINTAINERS: update ide-cd entry
ide-cd: fix 'ireason' reporting in cdrom_pc_intr()
ide-cd: fix error message in cdrom_pc_intr()
ide-cd: add error message for DMA error to cdrom_read_intr()
ide-cd: fix error messages in cdrom_write_intr()
ide-cd: add missing 'ireason' masking to cdrom_write_intr()
ide-cd: fix error messages in cdrom_{read,write}_check_ireason()
ide-cd: use ide_cd_release() in ide_cd_probe()
ide-cd: fix ACER/AOpen 24X CDROM speed reporting on big-endian machines
ide-cd: fix SAMSUNG CD-ROM SCR-3231 quirk
drivers/ide/: Spelling fixes
Diffstat (limited to 'drivers/ide/pci')
| -rw-r--r-- | drivers/ide/pci/cmd64x.c | 4 | ||||
| -rw-r--r-- | drivers/ide/pci/cs5535.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 51fca441c29..bc553337b1b 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c @@ -1,5 +1,5 @@ /* - * linux/drivers/ide/pci/cmd64x.c Version 1.51 Nov 8, 2007 + * linux/drivers/ide/pci/cmd64x.c Version 1.52 Dec 24, 2007 * * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines. * Due to massive hardware bugs, UltraDMA is only supported @@ -564,6 +564,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { .init_chipset = init_chipset_cmd64x, .init_hwif = init_hwif_cmd64x, .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, + .chipset = ide_cmd646, .host_flags = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE, .pio_mask = ATA_PIO5, .mwdma_mask = ATA_MWDMA2, @@ -573,7 +574,6 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { .init_chipset = init_chipset_cmd64x, .init_hwif = init_hwif_cmd64x, .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, - .chipset = ide_cmd646, .host_flags = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE, .pio_mask = ATA_PIO5, .mwdma_mask = ATA_MWDMA2, diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index 9094916e378..ddcbeba671e 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c @@ -49,7 +49,7 @@ #define ATAC_BM0_PRD 0x04 #define CS5535_CABLE_DETECT 0x48 -/* Format I PIO settings. We seperate out cmd and data for safer timings */ +/* Format I PIO settings. We separate out cmd and data for safer timings */ static unsigned int cs5535_pio_cmd_timings[5] = { 0xF7F4, 0x53F3, 0x13F1, 0x5131, 0x1131 }; |