diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 14:29:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 14:29:03 -0800 |
| commit | 7749c902592f610dc448830210174ab922f54be9 (patch) | |
| tree | aad9430a5d5ff71b68b4f798859a5ac98143d005 /drivers/ide/ppc/pmac.c | |
| parent | 2ea0718884c520f85c869c3bfef57477316ea91f (diff) | |
| parent | 6413f08666830afec21e41e50c28a2c5105ede69 (diff) | |
| download | op-kernel-dev-7749c902592f610dc448830210174ab922f54be9.zip op-kernel-dev-7749c902592f610dc448830210174ab922f54be9.tar.gz | |
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:
ide-scsi: use print_hex_dump from <linux/kernel.h>
ide: More TSST drives with broken cable detection
ali14xx: constify __initdata
ide: remove bogus ide_fix_driveid() comment
trm290: remove bogus init_hwif_trm290() comment
piix: add HP compaq laptop to short cable list
alim15x3: add Mitac 8317 and derivatives to ali_cable_override()
ide: add TORiSAN model: CD-ROM CDR_U200 fw: 1.09 to DMA blacklist
amd74xx: arm hack
drivers/ide: Add missing "space"
ide-cris: don't override ide_register_hw() result
ide: move CONFIG_IDE_ETRAX to drivers/ide/Kconfig
ide: add CONFIG_IDE_H8300 config option
ide/Kconfig: fix mpc8xx host driver dependencies
macide/q40ide: add missing __init tag to {macide,q40ide}_init()
aec62xx: Fix kernel oops in driver's probe function
ide: skip ide_wait_not_busy() on noprobe-disks
siimage: remove resetproc() method
ide: don't set PIO mode on pre-EIDE drives
sis5513.c: Add Packard Bell EasyNote K5305 to laptops
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 5afdfef..7f7a598 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -1513,7 +1513,7 @@ pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq) if (pmif->broken_dma && cur_addr & (L1_CACHE_BYTES - 1)) { if (pmif->broken_dma_warn == 0) { - printk(KERN_WARNING "%s: DMA on non aligned address," + printk(KERN_WARNING "%s: DMA on non aligned address, " "switching to PIO on Ohare chipset\n", drive->name); pmif->broken_dma_warn = 1; } |
