Merge master.kernel.org:/home/mochel/BK/linux-2.5-linus

into geena.pdx.osdl.net:/home/mochel/src/kernel/devel/linux-2.5-sync

drivers/base/core.c

@@ -96,9 +96,6 @@ void put_device(struct device * dev)
 	DBG("DEV: Unregistering device. ID = '%s', name = '%s'\n",
 	    dev->bus_id,dev->name);
 
-	/* remove the driverfs directory */
-	device_remove_dir(dev);
-
 	/* Notify the platform of the removal, in case they
 	 * need to do anything...
 	 */
@@ -112,6 +109,12 @@ void put_device(struct device * dev)
 	if (dev->driver && dev->driver->remove)
 		dev->driver->remove(dev,REMOVE_FREE_RESOURCES);
 
+	/* remove the driverfs directory */
+	device_remove_dir(dev);
+
+	if (dev->release)
+		dev->release(dev);
+
 	put_device(dev->parent);
 }
 

include/linux/device.h

@@ -92,6 +92,8 @@ struct device {
 					   being off. */
 
 	unsigned char *saved_state;	/* saved device state */
+
+	void	(*release)(struct device * dev);
 };
 
 static inline struct device *