Merge branch 'for-4.12/asus' into for-linus

This commit is contained in:
Jiri Kosina
2017-05-02 11:02:41 +02:00
9348 changed files with 413088 additions and 179087 deletions

View File

@@ -1,20 +0,0 @@
/* Header file for Freescale MPR121 Capacitive Touch Sensor */
#ifndef _MPR121_TOUCHKEY_H
#define _MPR121_TOUCHKEY_H
/**
* struct mpr121_platform_data - platform data for mpr121 sensor
* @keymap: pointer to array of KEY_* values representing keymap
* @keymap_size: size of the keymap
* @wakeup: configure the button as a wake-up source
* @vdd_uv: VDD voltage in uV
*/
struct mpr121_platform_data {
const unsigned short *keymap;
unsigned int keymap_size;
bool wakeup;
int vdd_uv;
};
#endif /* _MPR121_TOUCHKEY_H */