Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / device.h

diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index c6140cc97a80933bc129ca3b091183fdcd3ec747..9233b5c0bcc87ca6e9a7df4a7e9c59fe047bd946 100644 (file)
--- a/drivers/s390/cio/device.h
+++ b/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 *);