From 57a9b14cae7a839407da7fd731e42a417e04e02c Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor@insightbb.com>
Date: Wed, 13 Jun 2007 01:49:58 -0400
Subject: [PATCH] --- yaml --- r: 57700 b: refs/heads/master c:
 893e7c2db05f14032f2390ef7c59a499fc25ccae h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/input/Kconfig                    | 13 +++++++++++++
 trunk/drivers/input/Makefile                   |  1 +
 trunk/drivers/input/{misc => }/input-polldev.c |  0
 trunk/drivers/input/misc/Kconfig               | 11 -----------
 trunk/drivers/input/misc/Makefile              |  1 -
 6 files changed, 15 insertions(+), 13 deletions(-)
 rename trunk/drivers/input/{misc => }/input-polldev.c (100%)

diff --git a/[refs] b/[refs]
index dd2be6587115..0944c7a07821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c4df74e02b0853ad86d1595fb6065d6c26fb196
+refs/heads/master: 893e7c2db05f14032f2390ef7c59a499fc25ccae
diff --git a/trunk/drivers/input/Kconfig b/trunk/drivers/input/Kconfig
index 0e9b69535ad6..3cfff40695ec 100644
--- a/trunk/drivers/input/Kconfig
+++ b/trunk/drivers/input/Kconfig
@@ -38,6 +38,19 @@ config INPUT_FF_MEMLESS
 	  To compile this driver as a module, choose M here: the
 	  module will be called ff-memless.
 
+config INPUT_POLLDEV
+	tristate "Polled input device skeleton"
+	help
+	  Say Y here if you are using a driver for an input
+	  device that periodically polls hardware state. This
+	  option is only useful for out-of-tree drivers since
+	  in-tree drivers select it automatically.
+
+	  If unsure, say N.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called input-polldev.
+
 comment "Userland interfaces"
 
 config INPUT_MOUSEDEV
diff --git a/trunk/drivers/input/Makefile b/trunk/drivers/input/Makefile
index 8a2dd987546c..15eb752697b3 100644
--- a/trunk/drivers/input/Makefile
+++ b/trunk/drivers/input/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_INPUT)		+= input-core.o
 input-core-objs := input.o ff-core.o
 
 obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o
+obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o
 
 obj-$(CONFIG_INPUT_MOUSEDEV)	+= mousedev.o
 obj-$(CONFIG_INPUT_JOYDEV)	+= joydev.o
diff --git a/trunk/drivers/input/misc/input-polldev.c b/trunk/drivers/input/input-polldev.c
similarity index 100%
rename from trunk/drivers/input/misc/input-polldev.c
rename to trunk/drivers/input/input-polldev.c
diff --git a/trunk/drivers/input/misc/Kconfig b/trunk/drivers/input/misc/Kconfig
index 6013ace94d98..98ddafa30535 100644
--- a/trunk/drivers/input/misc/Kconfig
+++ b/trunk/drivers/input/misc/Kconfig
@@ -165,17 +165,6 @@ config INPUT_UINPUT
 	  To compile this driver as a module, choose M here: the
 	  module will be called uinput.
 
-config INPUT_POLLDEV
-	tristate "Polled input device skeleton"
-	help
-	  Say Y here if you are using a driver for an input
-	  device that periodically polls hardware state. This
-	  option is only useful for out-of-tree drivers since
-	  in-tree drivers select it automatically.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called input-polldev.
-
 config HP_SDC_RTC
 	tristate "HP SDC Real Time Clock"
 	depends on GSC || HP300
diff --git a/trunk/drivers/input/misc/Makefile b/trunk/drivers/input/misc/Makefile
index 8b2f7799e25c..3585b5038418 100644
--- a/trunk/drivers/input/misc/Makefile
+++ b/trunk/drivers/input/misc/Makefile
@@ -4,7 +4,6 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_INPUT_POLLDEV)		+= input-polldev.o
 obj-$(CONFIG_INPUT_SPARCSPKR)		+= sparcspkr.o
 obj-$(CONFIG_INPUT_PCSPKR)		+= pcspkr.o
 obj-$(CONFIG_INPUT_M68K_BEEP)		+= m68kspkr.o