From dc264dd21d336d534af3a157c8de1a0e4a814586 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Tue, 16 Oct 2007 23:30:58 -0700
Subject: [PATCH] --- yaml --- r: 70749 b: refs/heads/master c:
 fdc1ca8abae72c5829e099fd35626b83ecb12666 h: refs/heads/master i:   70747:
 2d14433a917bcf3f5e30ce1e6c6562aa45ba010d v: v3

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

diff --git a/[refs] b/[refs]
index 6a281288e235..5a2da685b868 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aee9041c5f36aa1353ada995c8f8bb3e6b167e4b
+refs/heads/master: fdc1ca8abae72c5829e099fd35626b83ecb12666
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 26e76947dbd1..639ed14bb08d 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -783,7 +783,10 @@ static inline int is_selected(int dor, int unit)
 
 static int set_dor(int fdc, char mask, char data)
 {
-	register unsigned char drive, unit, newdor, olddor;
+	unsigned char unit;
+	unsigned char drive;
+	unsigned char newdor;
+	unsigned char olddor;
 
 	if (FDCS->address == -1)
 		return -1;
@@ -937,7 +940,7 @@ static void motor_off_callback(unsigned long nr)
 static void floppy_off(unsigned int drive)
 {
 	unsigned long volatile delta;
-	register int fdc = FDC(drive);
+	int fdc = FDC(drive);
 
 	if (!(FDCS->dor & (0x10 << UNIT(drive))))
 		return;