3 files changed, 6 insertions, 13 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index 50e338d2ffda..ce1a756c4c30 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -345,6 +345,8 @@ struct input_absinfo {
 #define KEY_SAVE                234
 #define KEY_DOCUMENTS           235
 
+#define KEY_BATTERY             236
+
 #define KEY_UNKNOWN             240
 
 #define BTN_MISC                0x100
@@ -577,14 +579,9 @@ struct input_absinfo {
  * Switch events
  */
 
-#define SW_0                    0x00
-#define SW_1                    0x01
-#define SW_2                    0x02
-#define SW_3                    0x03
-#define SW_4                    0x04
-#define SW_5                    0x05
-#define SW_6                    0x06
-#define SW_7                    0x07
+#define SW_LID                  0x00  /* set = lid shut */
+#define SW_TABLET_MODE          0x01  /* set = tablet mode */
+#define SW_HEADPHONE_INSERT     0x02  /* set = inserted */
 #define SW_MAX                  0x0f
 
 /*
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index d6fe048376ab..590dc6dca315 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1231,6 +1231,7 @@
 #define PCI_DEVICE_ID_VIA_8380_0        0x0204
 #define PCI_DEVICE_ID_VIA_3238_0        0x0238
 #define PCI_DEVICE_ID_VIA_PT880         0x0258
+#define PCI_DEVICE_ID_VIA_PT880ULTRA    0x0308
 #define PCI_DEVICE_ID_VIA_PX8X0_0       0x0259
 #define PCI_DEVICE_ID_VIA_3269_0        0x0269
 #define PCI_DEVICE_ID_VIA_K8T800PRO_0   0x0282
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 530ae3f4248c..fab5aed8ca31 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -73,11 +73,6 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
 int vt_waitactive(int vt);
 void change_console(struct vc_data *new_vc);
 void reset_vc(struct vc_data *vc);
-#ifdef CONFIG_VT
-int is_console_suspend_safe(void);
-#else
-static inline int is_console_suspend_safe(void) { return 1; }
-#endif
 
 /*
  * vc_screen.c shares this temporary buffer with the console write code so that