From 486787f64c289db78a8fa13be4490f5e62e239b9 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 27 Sep 2007 07:49:39 -0400
Subject: [PATCH] --- yaml --- r: 66087 b: refs/heads/master c:
 cb3503ca54dc34e8dc3b823a6bd52c0807c102f4 h: refs/heads/master i:   66085:
 2b4fb87ca37fe8e03e4cfbafa8db8de180484903   66083:
 7e15f695fafb13f38ff401e8ba04bd96eac313e3   66079:
 88792e7706d1e0a479deb8329eed9f975c74a015 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/umem.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d00415f031ec..1365c4117424 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e953a216265f8646360fa909bdc87ea4bf446b3
+refs/heads/master: cb3503ca54dc34e8dc3b823a6bd52c0807c102f4
diff --git a/trunk/drivers/block/umem.c b/trunk/drivers/block/umem.c
index 251041763690..99806f9ee4ce 100644
--- a/trunk/drivers/block/umem.c
+++ b/trunk/drivers/block/umem.c
@@ -1029,7 +1029,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
 	data = ~data;
 	data += 1;
 
-	if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, "pci-umem", card)) {
+	if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, DRIVER_NAME, card)) {
 		dev_printk(KERN_ERR, &card->dev->dev,
 			"Unable to allocate IRQ\n");
 		ret = -ENODEV;
@@ -1155,7 +1155,7 @@ static int __init mm_init(void)
 	if (retval)
 		return -ENOMEM;
 
-	err = major_nr = register_blkdev(0, "umem");
+	err = major_nr = register_blkdev(0, DRIVER_NAME);
 	if (err < 0) {
 		pci_unregister_driver(&mm_pci_driver);
 		return -EIO;
@@ -1187,7 +1187,7 @@ static int __init mm_init(void)
 
 out:
 	pci_unregister_driver(&mm_pci_driver);
-	unregister_blkdev(major_nr, "umem");
+	unregister_blkdev(major_nr, DRIVER_NAME);
 	while (i--)
 		put_disk(mm_gendisk[i]);
 	return -ENOMEM;
@@ -1210,7 +1210,7 @@ static void __exit mm_cleanup(void)
 
 	pci_unregister_driver(&mm_pci_driver);
 
-	unregister_blkdev(major_nr, "umem");
+	unregister_blkdev(major_nr, DRIVER_NAME);
 }
 
 module_init(mm_init);