diff --git a/[refs] b/[refs]
index 2f6a374f79a7..ea3ae8458d6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 575cfc673e0f2e6f71ccc01bb77d7ec811054048
+refs/heads/master: be1c0fbfb4e84d0b02903cbc6358124586605a1b
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 9b4746871227..975fac3669c5 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -4127,7 +4127,7 @@ static ssize_t floppy_cmos_show(struct device *dev,
 	return sprintf(buf, "%X\n", UDP->cmos);
 }
 
-DEVICE_ATTR(cmos, S_IRUGO, floppy_cmos_show, NULL);
+static DEVICE_ATTR(cmos, S_IRUGO, floppy_cmos_show, NULL);
 
 static void floppy_device_release(struct device *dev)
 {