---

yaml --- r: 266971 b: refs/heads/master c: 1df5981 h: refs/heads/master i: 266969: 10d0186 266967: c6dfb23 v: v3
git-mirror · Aug 22, 2011 · 01a03ba · 01a03ba
1 parent f6fb150
commit 01a03ba
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 666 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae130d22de8f8977cc3015bfafc09ff93744d92a
+refs/heads/master: 1df5981b82d9eabdd6e66d1d9514164c02329345
diff --git a/trunk/drivers/base/regmap/Makefile b/trunk/drivers/base/regmap/Makefile
@@ -1,4 +1,3 @@
 obj-$(CONFIG_REGMAP) += regmap.o
-obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
 obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
 obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
diff --git a/trunk/drivers/base/regmap/internal.h b/trunk/drivers/base/regmap/internal.h
diff --git a/trunk/drivers/base/regmap/regmap-debugfs.c b/trunk/drivers/base/regmap/regmap-debugfs.c
diff --git a/trunk/drivers/base/regmap/regmap-i2c.c b/trunk/drivers/base/regmap/regmap-i2c.c
@@ -90,6 +90,7 @@ static int regmap_i2c_read(struct device *dev,
 }
 
 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,4 +113,3 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c,
 }
 EXPORT_SYMBOL_GPL(regmap_init_i2c);
 
-MODULE_LICENSE("GPL");
diff --git a/trunk/drivers/base/regmap/regmap-spi.c b/trunk/drivers/base/regmap/regmap-spi.c
@@ -47,6 +47,7 @@ static int regmap_spi_read(struct device *dev,
 }
 
 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,5 +70,3 @@ 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");