From 283da94139d375e1717778491a62a353b830a813 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Tue, 14 Mar 2006 00:09:05 -0500
Subject: [PATCH] --- yaml --- r: 25059 b: refs/heads/master c:
 493a7e0d5614c30e1f3e56d59ab774300a2609f2 h: refs/heads/master i:   25057:
 549ffaa691ef37eb74a49d4a3ff353aea7beac12   25055:
 50f90d7c98cc053c5f8d581deaf6ade829f24d36 v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/input.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4ac494fa102d..bcfdb172ce89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58a343f22e8ef987b90e34bbef7f1455e3bb5a15
+refs/heads/master: 493a7e0d5614c30e1f3e56d59ab774300a2609f2
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 6dca6baf06ff..cf30f3cb191a 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -421,7 +421,7 @@ struct input_absinfo {
 #define BTN_GEAR_UP		0x151
 
 #define KEY_OK			0x160
-#define KEY_SELECT 		0x161
+#define KEY_SELECT		0x161
 #define KEY_GOTO		0x162
 #define KEY_CLEAR		0x163
 #define KEY_POWER2		0x164
@@ -995,11 +995,6 @@ static inline void init_input_dev(struct input_dev *dev)
 
 struct input_dev *input_allocate_device(void);
 
-static inline void input_free_device(struct input_dev *dev)
-{
-	kfree(dev);
-}
-
 static inline struct input_dev *input_get_device(struct input_dev *dev)
 {
 	return to_input_dev(class_device_get(&dev->cdev));
@@ -1010,6 +1005,11 @@ static inline void input_put_device(struct input_dev *dev)
 	class_device_put(&dev->cdev);
 }
 
+static inline void input_free_device(struct input_dev *dev)
+{
+	input_put_device(dev);
+}
+
 int input_register_device(struct input_dev *);
 void input_unregister_device(struct input_dev *);