瀏覽代碼

Merge branch 'regmap-linus' into regmap-next

Mark Brown 14 年之前
父節點
當前提交
13c54137f7
共有 2 個文件被更改,包括 3 次插入0 次删除
  1. 1 0
      drivers/base/regmap/regmap-i2c.c
  2. 2 0
      drivers/base/regmap/regmap-spi.c

+ 1 - 0
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");

+ 2 - 0
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");