Merge branch 'regmap-linus' into regmap-next

13c54137 · Mark Brown · 790923e5 · b33f9cbd · 13c54137 · 13c54137
Commit 13c54137 authored Aug 12, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/base/regmap/regmap-i2c.c drivers/base/regmap/regmap-i2c.c +1 -0

drivers/base/regmap/regmap-spi.c drivers/base/regmap/regmap-spi.c +2 -0

No files found.
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -112,3 +112,4 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c,
 }
 EXPORT_SYMBOL_GPL(regmap_init_i2c);
+MODULE_LICENSE("GPL");
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -69,3 +69,5 @@ struct regmap *regmap_init_spi(struct spi_device *spi,
 	return regmap_init(&spi->dev, &regmap_spi, config);
 }
 EXPORT_SYMBOL_GPL(regmap_init_spi);
+MODULE_LICENSE("GPL");