Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_genhd.c

diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index e99d566b69cccdbdce2b5b680a1ec46ac97d2c3a..d3198303b93c5b004f0a14712fc39f6ef16ee0c0 100644 (file)
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -11,6 +11,8 @@
  *
  */
 
+#define KMSG_COMPONENT "dasd"
+
 #include <linux/interrupt.h>
 #include <linux/fs.h>
 #include <linux/blkpg.h>
@@ -163,9 +165,8 @@ int dasd_gendisk_init(void)
        /* Register to static dasd major 94 */
        rc = register_blkdev(DASD_MAJOR, "dasd");
        if (rc != 0) {
-               MESSAGE(KERN_WARNING,
-                       "Couldn't register successfully to "
-                       "major no %d", DASD_MAJOR);
+               pr_warning("Registering the device driver with major number "
+                          "%d failed\n", DASD_MAJOR);
                return rc;
        }
        return 0;