From 2a0d983ecf412dddd549bf82fb80a623186d7787 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 30 Apr 2009 15:23:42 +0200
Subject: [PATCH] --- yaml --- r: 151260 b: refs/heads/master c:
 8a8bdcc7533b104d789d9bb3ed90da9352515e21 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/dvb/dvb-core/dvbdev.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2d0c0364c75f..7f5bd625110a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07e9bb8eebb04c81323cbd3eabf07a3f6f05b204
+refs/heads/master: 8a8bdcc7533b104d789d9bb3ed90da9352515e21
diff --git a/trunk/drivers/media/dvb/dvb-core/dvbdev.c b/trunk/drivers/media/dvb/dvb-core/dvbdev.c
index a454ee8f1e43..479dd05762a5 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvbdev.c
@@ -447,6 +447,15 @@ static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env)
 	return 0;
 }
 
+static char *dvb_nodename(struct device *dev)
+{
+	struct dvb_device *dvbdev = dev_get_drvdata(dev);
+
+	return kasprintf(GFP_KERNEL, "dvb/adapter%d/%s%d",
+		dvbdev->adapter->num, dnames[dvbdev->type], dvbdev->id);
+}
+
+
 static int __init init_dvbdev(void)
 {
 	int retval;
@@ -469,6 +478,7 @@ static int __init init_dvbdev(void)
 		goto error;
 	}
 	dvb_class->dev_uevent = dvb_uevent;
+	dvb_class->nodename = dvb_nodename;
 	return 0;
 
 error: