Merge branch 'regmap-linus' into regmap-next

diff --combined drivers/base/regmap/regmap-i2c.c
index e6ce82d,c4f7a45..e7d916d
--- 1/drivers/base/regmap/regmap-i2c.c
--- 2/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@@ -90,6 -90,7 +90,6 @@@ static int regmap_i2c_read(struct devic
  }
  
  static struct regmap_bus regmap_i2c = {
 -      .type = &i2c_bus_type,
        .write = regmap_i2c_write,
        .gather_write = regmap_i2c_gather_write,
        .read = regmap_i2c_read,
@@@ -112,3 -113,4 +112,4 @@@ struct regmap *regmap_init_i2c(struct i
  }
  EXPORT_SYMBOL_GPL(regmap_init_i2c);
  
+ MODULE_LICENSE("GPL");

diff --combined drivers/base/regmap/regmap-spi.c
index 07633bd,2bbc659..cc0f116
--- 1/drivers/base/regmap/regmap-spi.c
--- 2/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@@ -47,6 -47,7 +47,6 @@@ static int regmap_spi_read(struct devic
  }
  
  static struct regmap_bus regmap_spi = {
 -      .type = &spi_bus_type,
        .write = regmap_spi_write,
        .gather_write = regmap_spi_gather_write,
        .read = regmap_spi_read,
@@@ -69,3 -70,5 +69,5 @@@ struct regmap *regmap_init_spi(struct s
        return regmap_init(&spi->dev, &regmap_spi, config);
  }
  EXPORT_SYMBOL_GPL(regmap_init_spi);
+ 
+ MODULE_LICENSE("GPL");