Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / base / regmap / regmap-spi.c

diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
index f839694..2560658 100644 (file)
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -48,11 +48,9 @@ static int regmap_spi_read(struct device *dev,
 }
 
 static struct regmap_bus regmap_spi = {
-       .type = &spi_bus_type,
        .write = regmap_spi_write,
        .gather_write = regmap_spi_gather_write,
        .read = regmap_spi_read,
-       .owner = THIS_MODULE,
        .read_flag_mask = 0x80,
 };