diff --git a/[refs] b/[refs]
index ea3ae8458d6e..fd7f5f0082df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be1c0fbfb4e84d0b02903cbc6358124586605a1b
+refs/heads/master: 21af5448042a0962fb1df13a310bb363a8f6a8dc
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 975fac3669c5..fd7085aa999f 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -3337,7 +3337,7 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g,
 }
 
 /* handle obsolete ioctl's */
-static int ioctl_table[] = {
+static unsigned int ioctl_table[] = {
 	FDCLRPRM,
 	FDSETPRM,
 	FDDEFPRM,
@@ -3365,7 +3365,7 @@ static int ioctl_table[] = {
 	FDTWADDLE
 };
 
-static int normalize_ioctl(int *cmd, int *size)
+static int normalize_ioctl(unsigned int *cmd, int *size)
 {
 	int i;