From 6015e4ada6902055147c9362d41d17f49d53801d Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 3 Feb 2010 18:44:44 -0800
Subject: [PATCH] --- yaml --- r: 185817 b: refs/heads/master c:
 b1681c56f5b6bf551bed2617a395855055836571 h: refs/heads/master i:   185815:
 648986708367f71d368947446c525f6fcac32aca v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/ide/au1xxx-ide.c | 4 ++--
 trunk/drivers/ide/pmac.c       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 92542aa1f2fe..6fc843f33872 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dabcfef3e668f6dd32147d810a29ccbd55dc963
+refs/heads/master: b1681c56f5b6bf551bed2617a395855055836571
diff --git a/trunk/drivers/ide/au1xxx-ide.c b/trunk/drivers/ide/au1xxx-ide.c
index e2fd378ba9de..bd0930a60b0c 100644
--- a/trunk/drivers/ide/au1xxx-ide.c
+++ b/trunk/drivers/ide/au1xxx-ide.c
@@ -299,8 +299,8 @@ static int auide_dma_test_irq(ide_drive_t *drive)
 	 */
 	drive->waiting_for_dma++;
 	if (drive->waiting_for_dma >= DMA_WAIT_TIMEOUT) {
-		printk(KERN_WARNING "%s: timeout waiting for ddma to \
-                                     complete\n", drive->name);
+		printk(KERN_WARNING "%s: timeout waiting for ddma to complete\n",
+		       drive->name);
 		return 1;
 	}
 	udelay(10);
diff --git a/trunk/drivers/ide/pmac.c b/trunk/drivers/ide/pmac.c
index 9fae1fb1468b..850ee452e9bb 100644
--- a/trunk/drivers/ide/pmac.c
+++ b/trunk/drivers/ide/pmac.c
@@ -1650,8 +1650,8 @@ pmac_ide_dma_test_irq (ide_drive_t *drive)
 		if ((status & FLUSH) == 0)
 			break;
 		if (++timeout > 100) {
-			printk(KERN_WARNING "ide%d, ide_dma_test_irq \
-			timeout flushing channel\n", hwif->index);
+			printk(KERN_WARNING "ide%d, ide_dma_test_irq timeout flushing channel\n",
+			       hwif->index);
 			break;
 		}
 	}