xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

Browse Source 
Conflicts:
	drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
This commit is contained in:
Mark Brown
2012-05-12 11:10:25 +01:00
parent 178e43aef2 411a2df509
commit 5949a7e9ab
33 changed files with 559 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/mfd/tps6586x.h
View File

@@ -68,6 +68,7 @@ struct tps6586x_subdev_info {
int id;
const char *name;
void *platform_data;
struct device_node *of_node;
};
struct tps6586x_platform_data {