diff --git a/[refs] b/[refs]
index cac2fd260ab7..84aadcd01763 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3b017d8c9915cbaa8bab178dde1bd9dbbf5012c
+refs/heads/master: 3c9da7ba049d11caccc219576a3a23404aa2fc50
diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c
index 94bdd4d8a4c9..39c98f940507 100644
--- a/trunk/drivers/s390/cio/device.c
+++ b/trunk/drivers/s390/cio/device.c
@@ -532,8 +532,7 @@ device_remove_files(struct device *dev)
 
 /* this is a simple abstraction for device_register that sets the
  * correct bus type and adds the bus specific files */
-int
-ccw_device_register(struct ccw_device *cdev)
+static int ccw_device_register(struct ccw_device *cdev)
 {
 	struct device *dev = &cdev->dev;
 	int ret;
diff --git a/trunk/drivers/s390/cio/device.h b/trunk/drivers/s390/cio/device.h
index c6140cc97a80..9233b5c0bcc8 100644
--- a/trunk/drivers/s390/cio/device.h
+++ b/trunk/drivers/s390/cio/device.h
@@ -78,7 +78,6 @@ void io_subchannel_recog_done(struct ccw_device *cdev);
 
 int ccw_device_cancel_halt_clear(struct ccw_device *);
 
-int ccw_device_register(struct ccw_device *);
 void ccw_device_do_unreg_rereg(void *);
 void ccw_device_call_sch_unregister(void *);