diff options
| author | doc HD <doc.divxm@gmail.com> | 2016-01-17 09:43:13 +0200 |
|---|---|---|
| committer | doc HD <doc.divxm@gmail.com> | 2016-01-17 09:43:13 +0200 |
| commit | e274d58bdc0e07d419ed23f79e199ad37e60b913 (patch) | |
| tree | ed7ffac1522ac0a214a84ea9fd92cfea97897ffb /include/linux/gpio_keys.h | |
| parent | 547e531177ec9635ddfb57ba314b27d52f2db203 (diff) | |
| parent | c845c922569b206319d945f391ecf5de3c051bee (diff) | |
Merge branch 'cm-13.0' of CyanogenMod/android_kernel_google_msm into mm6.0mm6.0-old
Conflicts:
arch/arm/configs/aicp_flo_defconfig
drivers/video/msm/mipi_JDI.c
drivers/video/msm/mipi_JDI.h
Change-Id: Ifcd6f93b59c81c1637f7e737666b48bdafab9dd4
Diffstat (limited to 'include/linux/gpio_keys.h')
| -rw-r--r-- | include/linux/gpio_keys.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h index d02ba7b922d..a7e977ff4ab 100644 --- a/include/linux/gpio_keys.h +++ b/include/linux/gpio_keys.h @@ -15,8 +15,6 @@ struct gpio_keys_button { bool can_disable; int value; /* axis value for EV_ABS */ unsigned int irq; /* Irq number in case of interrupt keys */ - bool can_reset; /* key is able to reset system */ - int reset_interval; /* reset key interval in msec */ }; struct gpio_keys_platform_data { @@ -30,12 +28,4 @@ struct gpio_keys_platform_data { const char *name; /* input device name */ }; - -#define RESETKEY_PRESS 0x0001 /* power key is pressed */ -#define RESETKEY_RELEASE 0x0002 /* power key is released */ -#define RESETKEY_PREPARE_HWREST 0x0003 /* Going to reset whole system by pmic*/ - -extern int register_resetkey_notifier(struct notifier_block *nb); -extern int unregister_resetkey_notifier(struct notifier_block *nb); - #endif |