Merge branch 'regmap-linus' into regmap-next

2011-08-12 10:43:15 +09:00 · 2011-08-12 10:43:15 +09:00 · 13c54137f7
parent 790923e56b b33f9cbd67
commit 13c54137f7
2 changed files with 3 additions and 0 deletions
--- 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");