diff -Naur linux-2.6.30.4-orig/drivers/spi2/busses/Kconfig linux-2.6.30.4-new/drivers/spi2/busses/Kconfig
--- linux-2.6.30.4-orig/drivers/spi2/busses/Kconfig	2010-02-05 10:38:57.188947000 -0800
+++ linux-2.6.30.4-new/drivers/spi2/busses/Kconfig	2010-02-05 10:50:09.767009000 -0800
@@ -6,4 +6,8 @@
 	tristate "Comcerto"
 	depends on SPI_MSPD
 
+config SPI2SPI
+	tristate "SPI2 to SPI converter"
+	depends on SPI_MSPD
+
 endmenu
diff -Naur linux-2.6.30.4-orig/drivers/spi2/busses/Makefile linux-2.6.30.4-new/drivers/spi2/busses/Makefile
--- linux-2.6.30.4-orig/drivers/spi2/busses/Makefile	2010-02-05 10:38:57.193948000 -0800
+++ linux-2.6.30.4-new/drivers/spi2/busses/Makefile	2010-02-05 10:50:09.772009000 -0800
@@ -1 +1,2 @@
 obj-$(CONFIG_COMCERTO_SPI)        += comcerto_spi.o
+obj-$(CONFIG_SPI2SPI)        += spi2spi.o
diff -Naur linux-2.6.30.4-orig/drivers/spi2/busses/spi2spi.c linux-2.6.30.4-new/drivers/spi2/busses/spi2spi.c
--- linux-2.6.30.4-orig/drivers/spi2/busses/spi2spi.c	2010-02-05 10:51:01.509633000 -0800
+++ linux-2.6.30.4-new/drivers/spi2/busses/spi2spi.c	2010-02-05 10:50:09.775009000 -0800
@@ -25,7 +25,6 @@
 	struct spi2spi *spi2spi = dev_get_drvdata(&adapter->dev);
 	struct spi_message m;
 	struct spi_transfer x = {};
-	int ret;
 
 	proxy.dev = adapter->dev; /* not really kosher */
 	proxy.master = platform_get_drvdata(spi2spi->master);
