---

yaml --- r: 266982 b: refs/heads/master c: 069af89 h: refs/heads/master v: v3
git-mirror · Sep 9, 2011 · edd639d · edd639d
1 parent 02cba34
commit edd639d
Show file tree

Hide file tree

Showing 18 changed files with 570 additions and 999 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbcf61ca8dcf093bd030a4dafb662b714676652d
+refs/heads/master: 069af897f9a3f70248d4a7ba3d3d439f7cd66d92
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,9 +90,11 @@ 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,
+	.owner = THIS_MODULE,
 };
 
 /**
@@ -111,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,9 +47,11 @@ 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,
+	.owner = THIS_MODULE,
 	.read_flag_mask = 0x80,
 };
 
@@ -68,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");