4 files changed, 1 insertions, 80 deletions
diff --git a/include/linux/charger_notify.h b/include/linux/charger_notify.h
deleted file mode 100644
index 49bd6cb07be..00000000000
--- a/include/linux/charger_notify.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2014 Motorola Mobility LLC.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CHARGER_NOTIFY_H
-#define CHARGER_NOTIFY_H
-
-#ifdef __KERNEL__
-
-enum charger_event {
-	EVENT_DOCKON,
-	EVENT_DOCKOFF,
-	EVENT_END
-};
-
-
-extern void charger_register_notify(struct notifier_block *nb);
-extern void charger_unregister_notify(struct notifier_block *nb);
-extern void charger_notify_subscriber(unsigned long event);
-#endif /* __KERNEL__ */
-
-#endif /* CHARGER_NOTIFY_H */
diff --git a/include/linux/display_notify.h b/include/linux/display_notify.h
deleted file mode 100644
index 3dbb6128c4b..00000000000
--- a/include/linux/display_notify.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2014 Motorola Mobility LLC.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DISPLAY_NOTIFY_H
-#define DISPLAY_NOTIFY_H
-
-#ifdef __KERNEL__
-
-enum display_event {
-	DISPLAY_EVENT_DISPLAYON,
-	DISPLAY_EVENT_DISPLAYOFF,
-	DISPLAY_EVENT_END
-};
-
-
-extern void display_register_notify(struct notifier_block *nb);
-extern void display_unregister_notify(struct notifier_block *nb);
-extern void display_notify_subscriber(unsigned long event);
-#endif /* __KERNEL__ */
-
-#endif /* DISPLAY_NOTIFY_H */
diff --git a/include/linux/mfd/tps65912.h b/include/linux/mfd/tps65912.h
index 6452efcdd8c..426f5e5e08f 100644
--- a/include/linux/mfd/tps65912.h
+++ b/include/linux/mfd/tps65912.h
@@ -15,10 +15,6 @@
 #ifndef __LINUX_MFD_TPS65912_H
 #define __LINUX_MFD_TPS65912_H
 
-#ifdef CONFIG_POWER_KEY_OVERRIDE
-#include <linux/notifier.h>
-#endif
-
 /* TPS regulator type list */
 #define REGULATOR_LDO		0
 #define REGULATOR_DCDC		1
@@ -345,13 +341,6 @@ struct tps65912 {
 	u32 powerkey_up_irq;
 	u32 powerkey_down_irq;
 	struct mutex pm_lock;   /* guard access to spi bus from irq */
-#ifdef CONFIG_POWER_KEY_OVERRIDE
-	struct notifier_block charger_nb;
-	bool dockstatus;
-	struct notifier_block display_nb;
-	bool displaystatus;
-	int lastkeyevent;
-#endif
 };
 
 struct tps65912_platform_data {
diff --git a/include/linux/wakeup_source_notify.h b/include/linux/wakeup_source_notify.h
index 2681835738d..98db849d13d 100644
--- a/include/linux/wakeup_source_notify.h
+++ b/include/linux/wakeup_source_notify.h
@@ -14,7 +14,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WAKEUP_SOURCE_NOTIFY_H
+#ifndef WAKEUP_SOURCEE_NOTIFY_H
 #define WAKEUP_SOURCE_NOTIFY_H
 
 #ifdef __KERNEL__