mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'ec-cleanup' into release
Conflicts: drivers/platform/x86/compal-laptop.c
This commit is contained in:
commit
751516f0a9
4 changed files with 15 additions and 22 deletions
|
|
@ -150,8 +150,7 @@ extern int ec_read(u8 addr, u8 *val);
|
|||
extern int ec_write(u8 addr, u8 val);
|
||||
extern int ec_transaction(u8 command,
|
||||
const u8 *wdata, unsigned wdata_len,
|
||||
u8 *rdata, unsigned rdata_len,
|
||||
int force_poll);
|
||||
u8 *rdata, unsigned rdata_len);
|
||||
|
||||
#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue