diff options
| author | Amit Jain <ajain@motorola.com> | 2014-10-04 20:13:37 +0000 |
|---|---|---|
| committer | Amit Jain <ajain@motorola.com> | 2014-10-04 20:13:37 +0000 |
| commit | b431796a84b21383566d0d1b1728da4fe265a357 (patch) | |
| tree | 2b2ee8a290f4f89da8ca48aefba8e6b4abe47f43 /drivers/misc/bq5105x_detect.c | |
| parent | 58efe519a5477c70a184cdf376520122127f69f0 (diff) | |
| download | olio-linux-3.10-b431796a84b21383566d0d1b1728da4fe265a357.tar.xz olio-linux-3.10-b431796a84b21383566d0d1b1728da4fe265a357.zip | |
Revert "IKXCLOCK-4061: power key behavior change"
This reverts commit 58efe519a5477c70a184cdf376520122127f69f0.
Change-Id: I8a80fcb5d7386ac8c74da99aa649ad549d64d3a1
Diffstat (limited to 'drivers/misc/bq5105x_detect.c')
| -rw-r--r-- | drivers/misc/bq5105x_detect.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/misc/bq5105x_detect.c b/drivers/misc/bq5105x_detect.c index 4c01828f5ca..37cbdcaa11c 100644 --- a/drivers/misc/bq5105x_detect.c +++ b/drivers/misc/bq5105x_detect.c @@ -31,12 +31,7 @@ #include <linux/switch.h> #include <linux/wakelock.h> #include <linux/workqueue.h> -#ifdef CONFIG_WAKEUP_SOURCE_NOTIFY #include <linux/wakeup_source_notify.h> -#endif -#ifdef CONFIG_POWER_KEY_OVERRIDE -#include <linux/charger_notify.h> -#endif /* * Detect when a device is placed on a wireless charger and report this to user @@ -220,10 +215,6 @@ static void bq5105x_detect_report(struct bq5105x_detect *chip, bool docked) { if (chip->reported_docked != docked) { dev_dbg(&chip->pdev->dev, "report docked=%d\n", docked); -#ifdef CONFIG_POWER_KEY_OVERRIDE - charger_notify_subscriber(docked - ? EVENT_DOCKON : EVENT_DOCKOFF); -#endif #ifdef CONFIG_WAKEUP_SOURCE_NOTIFY wakeup_source_notify_subscriber(docked ? DISPLAY_WAKE_EVENT_DOCKON |