From db19652f845fc3db9970340abd63cf9ec5fff6d6 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:19:15 -0500
Subject: [PATCH] --- yaml --- r: 336986 b: refs/heads/master c:
 2c9e9fdc0b2d55886609f0503fb91f96dfec6948 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/drivers/w1/w1.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c654fe6bcacc..0bd219b6c975 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82849a93aad04c5a438d811081341b245fdade8c
+refs/heads/master: 2c9e9fdc0b2d55886609f0503fb91f96dfec6948
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
index 1a574370d2cd..7994d933f040 100644
--- a/trunk/drivers/w1/w1.c
+++ b/trunk/drivers/w1/w1.c
@@ -551,7 +551,6 @@ void w1_destroy_master_attributes(struct w1_master *master)
 	sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
 }
 
-#ifdef CONFIG_HOTPLUG
 static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
 	struct w1_master *md = NULL;
@@ -587,12 +586,6 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
 end:
 	return err;
 }
-#else
-static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-	return 0;
-}
-#endif
 
 static int __w1_attach_slave_device(struct w1_slave *sl)
 {