---

yaml --- r: 336895 b: refs/heads/master c: 13ee2b9 h: refs/heads/master i: 336893: 84cd1de 336891: 609f77b 336887: 8928b1f 336879: fc61444 336863: e49dd95 336831: 2686a79 336767: 2bedc83 336639: 06cb8ae 336383: 1aed766 335871: 3e43c2f v: v3
git-mirror · Nov 28, 2012 · eeb4229 · eeb4229
1 parent f96f30a
commit eeb4229
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e4b9d0bb2a6464e541d51a1e59ba73470c7c453
+refs/heads/master: 13ee2b943c366fc899c860b1aef1c8a2b7a0e546
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
@@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
 	return 0;
 }
 
-#ifdef CONFIG_HOTPLUG
-
 static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
 	struct pcmcia_device *p_dev;
@@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 	return 0;
 }
 
-#else
-
-static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-	return -ENODEV;
-}
-
-#endif
-
 /************************ runtime PM support ***************************/
 
 static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);