diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 10:43:15 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-12 10:43:15 +0900 |
| commit | 13c54137f7896928ced8e97708d409fa39c09e00 (patch) | |
| tree | 4e95e486cbfdb872917984e78484b15f2d84a20e /drivers/base/regmap | |
| parent | 790923e56be795e14eaaeb3305cb4e171cd0a72f (diff) | |
| parent | b33f9cbd67ba1a1c46879ec66467269f09cde8e5 (diff) | |
| download | linux-13c54137f7896928ced8e97708d409fa39c09e00.tar.gz linux-13c54137f7896928ced8e97708d409fa39c09e00.tar.bz2 linux-13c54137f7896928ced8e97708d409fa39c09e00.zip | |
Merge branch 'regmap-linus' into regmap-next
Diffstat (limited to 'drivers/base/regmap')
| -rw-r--r-- | drivers/base/regmap/regmap-i2c.c | 1 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap-spi.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c index e6ce82d0ecd1..e7d916d1b3ea 100644 --- 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"); diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c index 07633bda0a04..cc0f1164cf99 100644 --- 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, ®map_spi, config); } EXPORT_SYMBOL_GPL(regmap_init_spi); + +MODULE_LICENSE("GPL"); |