Merge branch 'linus' into x86/urgent

[~andy/linux] / drivers / mtd / devices / sst25l.c

diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index d38ef3bffe8d0723806835df2d1093a017757380..5fc198350b94b66ea27b5e7113f4f192c61c9dfd 100644 (file)
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -378,7 +378,7 @@ static int __devinit sst25l_probe(struct spi_device *spi)
        struct flash_info *flash_info;
        struct sst25l_flash *flash;
        struct flash_platform_data *data;
-       int ret, i;
+       int ret;
 
        flash_info = sst25l_match_device(spi);
        if (!flash_info)
@@ -444,7 +444,6 @@ static int __devexit sst25l_remove(struct spi_device *spi)
 static struct spi_driver sst25l_driver = {
        .driver = {
                .name   = "sst25l",
-               .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
        },
        .probe          = sst25l_probe,