From f8e9a72ecb09ff5394f0bb28f4c90ca1b067d75b Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 10 Mar 2010 15:20:51 -0800
Subject: [PATCH] --- yaml --- r: 187129 b: refs/heads/master c:
 96534f1dd5bf9d324c2d31355cb69565381d1460 h: refs/heads/master i:   187127:
 7f4d5e374cbbc594d76c75b23a7694a267062ea5 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/block/floppy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4677e5e5607..10d59be11a20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b87c9e0a880f2992dc210eb4ea8b2da6c63883ca
+refs/heads/master: 96534f1dd5bf9d324c2d31355cb69565381d1460
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 0cea96ceb78c..7743d6c2dd6b 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -4262,7 +4262,7 @@ static int __init floppy_init(void)
 		FDCS->dtr = -1;
 		FDCS->dor = 0x4;
 #if defined(__sparc__) || defined(__mc68000__)
-		/*sparcs/sun3x don't have a DOR reset which we can fall back on to */
+	/*sparcs/sun3x don't have a DOR reset which we can fall back on to */
 #ifdef __mc68000__
 		if (MACH_IS_SUN3X)
 #endif