From: Andrew Morton <akpm@osdl.org>

drivers/spi/spi.c:128: `spi_bus_probe' undeclared here (not in a function)
drivers/spi/spi.c:128: initializer element is not constant
drivers/spi/spi.c:128: (near initialization for `spi_bus_type.probe')
drivers/spi/spi.c:129: `spi_bus_remove' undeclared here (not in a function)
drivers/spi/spi.c:129: initializer element is not constant
drivers/spi/spi.c:129: (near initialization for `spi_bus_type.remove')
drivers/spi/spi.c:130: `spi_bus_shutdown' undeclared here (not in a function)
drivers/spi/spi.c:130: initializer element is not constant
drivers/spi/spi.c:130: (near initialization for `spi_bus_type.shutdown')
drivers/spi/spi.c:138: warning: `spi_bus_probe' defined but not used
drivers/spi/spi.c:145: warning: `spi_bus_remove' defined but not used
drivers/spi/spi.c:152: warning: `spi_bus_shutdown' defined but not used

<mystified as to how this ever compiled...>

Cc: dmitry pervushin <dpervushin@ru.mvista.com>
Cc: Greg KH <greg@kroah.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/spi/spi.c |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff -puN drivers/spi/spi.c~spi-add-bus-methods-instead-of-drivers-ones-fixes drivers/spi/spi.c
--- devel/drivers/spi/spi.c~spi-add-bus-methods-instead-of-drivers-ones-fixes	2006-01-10 23:40:54.000000000 -0800
+++ devel-akpm/drivers/spi/spi.c	2006-01-10 23:40:54.000000000 -0800
@@ -120,20 +120,6 @@ static int spi_resume(struct device *dev
 #define spi_resume	NULL
 #endif
 
-struct bus_type spi_bus_type = {
-	.name		= "spi",
-	.dev_attrs	= spi_dev_attrs,
-	.match		= spi_match_device,
-	.uevent		= spi_uevent,
-	.probe		= spi_bus_probe,
-	.remove		= spi_bus_remove,
-	.shutdown	= spi_bus_shutdown,
-	.suspend	= spi_suspend,
-	.resume		= spi_resume,
-};
-EXPORT_SYMBOL_GPL(spi_bus_type);
-
-
 static int spi_bus_probe(struct device *dev)
 {
 	const struct spi_driver		*sdrv = to_spi_driver(dev->driver);
@@ -156,6 +142,19 @@ static void spi_bus_shutdown(struct devi
 		sdrv->shutdown(to_spi_device(dev));
 }
 
+struct bus_type spi_bus_type = {
+	.name		= "spi",
+	.dev_attrs	= spi_dev_attrs,
+	.match		= spi_match_device,
+	.uevent		= spi_uevent,
+	.probe		= spi_bus_probe,
+	.remove		= spi_bus_remove,
+	.shutdown	= spi_bus_shutdown,
+	.suspend	= spi_suspend,
+	.resume		= spi_resume,
+};
+EXPORT_SYMBOL_GPL(spi_bus_type);
+
 int spi_register_driver(struct spi_driver *sdrv)
 {
 	sdrv->driver.bus = &spi_bus_type;
_