From: Andrew Morton <akpm@osdl.org>

Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/spi/spi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/spi/spi.c~simple-spi-framework-gregkh-hotplug-fix drivers/spi/spi.c
--- devel/drivers/spi/spi.c~simple-spi-framework-gregkh-hotplug-fix	2005-11-28 00:21:06.000000000 -0800
+++ devel-akpm/drivers/spi/spi.c	2005-11-28 00:21:58.000000000 -0800
@@ -70,7 +70,7 @@ static int spi_match_device(struct devic
 	return strncmp(spi->modalias, drv->name, BUS_ID_SIZE) == 0;
 }
 
-static int spi_hotplug(struct device *dev, char **envp, int num_envp,
+static int spi_uevent(struct device *dev, char **envp, int num_envp,
 		char *buffer, int buffer_size)
 {
 	const struct spi_device		*spi = to_spi_device(dev);
@@ -129,7 +129,7 @@ struct bus_type spi_bus_type = {
 	.name		= "spi",
 	.dev_attrs	= spi_dev_attrs,
 	.match		= spi_match_device,
-	.hotplug	= spi_hotplug,
+	.uevent		= spi_uevent,
 	.suspend	= spi_suspend,
 	.resume		= spi_resume,
 };
_