mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge 3.8-rc5 into driver-core-next
This resolves a gpio driver merge issue pointed out in linux-next. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
422d26b6ec
248 changed files with 2063 additions and 1231 deletions
|
|
@ -121,8 +121,6 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map,
|
|||
c->max = p - 1;
|
||||
list_add_tail(&c->list,
|
||||
&map->debugfs_off_cache);
|
||||
} else {
|
||||
return base;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1106,7 +1106,7 @@ EXPORT_SYMBOL_GPL(regmap_raw_write);
|
|||
* @val_count: Number of registers to write
|
||||
*
|
||||
* This function is intended to be used for writing a large block of
|
||||
* data to be device either in single transfer or multiple transfer.
|
||||
* data to the device either in single transfer or multiple transfer.
|
||||
*
|
||||
* A value of zero will be returned on success, a negative errno will
|
||||
* be returned in error cases.
|
||||
|
|
|
|||
Loading…
Reference in a new issue