From 0ca886bed0a5bfcd61e76327e1f5a509c2fb5345 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Mon, 23 Feb 2009 12:38:41 +0000
Subject: [PATCH] --- yaml --- r: 140459 b: refs/heads/master c:
 6b0b62853b2553be375033776902640320970846 h: refs/heads/master i:   140457:
 3f901b1254f016e3f064d1ea01eacd87ec0b47fd   140455:
 8a47ad6c57f2e8f9db437d775c03b53c7d413386 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/card/block.c | 2 ++
 trunk/drivers/mmc/core/bus.c   | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 545890166953..67bc409dfedb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7de427d088a967d2173739e21e744921d5496a8b
+refs/heads/master: 6b0b62853b2553be375033776902640320970846
diff --git a/trunk/drivers/mmc/card/block.c b/trunk/drivers/mmc/card/block.c
index 513eb09a638f..fe8041e619ea 100644
--- a/trunk/drivers/mmc/card/block.c
+++ b/trunk/drivers/mmc/card/block.c
@@ -41,6 +41,8 @@
 
 #include "queue.h"
 
+MODULE_ALIAS("mmc:block");
+
 /*
  * max 8 partitions per card
  */
diff --git a/trunk/drivers/mmc/core/bus.c b/trunk/drivers/mmc/core/bus.c
index f210a8ee6861..bdb165f93046 100644
--- a/trunk/drivers/mmc/core/bus.c
+++ b/trunk/drivers/mmc/core/bus.c
@@ -84,6 +84,14 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 	}
 
 	retval = add_uevent_var(env, "MMC_NAME=%s", mmc_card_name(card));
+	if (retval)
+		return retval;
+
+	/*
+	 * Request the mmc_block device.  Note: that this is a direct request
+	 * for the module it carries no information as to what is inserted.
+	 */
+	retval = add_uevent_var(env, "MODALIAS=mmc:block");
 
 	return retval;
 }