Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / sclp_sdias.c

diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 52283daddaef224db42cf70bd3ba421ab11b5059..1c064976b32bd322a4e4554e9d335bf1cef71328 100644 (file)
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -66,9 +66,9 @@ static DEFINE_MUTEX(sdias_mutex);
 
 static void sdias_callback(struct sclp_req *request, void *data)
 {
-       struct sdias_sccb *sccb;
+       struct sdias_sccb *cbsccb;
 
-       sccb = (struct sdias_sccb *) request->sccb;
+       cbsccb = (struct sdias_sccb *) request->sccb;
        sclp_req_done = 1;
        wake_up(&sdias_wq); /* Inform caller, that request is complete */
        TRACE("callback done\n");
@@ -229,7 +229,7 @@ out:
        return rc;
 }
 
-int __init sdias_init(void)
+int __init sclp_sdias_init(void)
 {
        int rc;
 
@@ -248,7 +248,7 @@ int __init sdias_init(void)
        return 0;
 }
 
-void __exit sdias_exit(void)
+void __exit sclp_sdias_exit(void)
 {
        debug_unregister(sdias_dbf);
        sclp_unregister(&sclp_sdias_register);