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

Merge tag 'v3.16-rc6' into next

Browse Source 
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
This commit is contained in:
Dmitry Torokhov
2014-07-24 12:36:56 -07:00
parent 9d8dc3e529 9a3c4145af
commit b9f12a5d97
9812 changed files with 499375 additions and 251376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/i2c/twl.h
View File

@@ -498,7 +498,10 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
#define RES_GRP_ALL 0x7 /* All resource groups */
#define RES_TYPE2_R0 0x0
#define RES_TYPE2_R1 0x1
#define RES_TYPE2_R2 0x2
#define RES_TYPE_R0 0x0
#define RES_TYPE_ALL 0x7
/* Resource states */
@@ -671,6 +674,7 @@ struct twl4030_power_data {
struct twl4030_script **scripts;
unsigned num;
struct twl4030_resconfig *resource_config;
struct twl4030_resconfig *board_config;
#define TWL4030_RESCONFIG_UNDEF ((u8)-1)
bool use_poweroff; /* Board is wired for TWL poweroff */
};