aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-06-13 01:49:58 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-06-13 01:49:58 -0400
commit893e7c2db05f14032f2390ef7c59a499fc25ccae (patch)
tree75c7882b71aea19ea5e71be509d0af6107404a8e /drivers
parent8c4df74e02b0853ad86d1595fb6065d6c26fb196 (diff)
Input: move input-polldev to drivers/input
To work around deficiences in Kconfig that allows to "select" a symbol without automatically selecting all dependencies for that symbol move input-polldev from drivers/input/misc to drivers/input thus removing extra dependency on CONFIG_INPUT_MISC. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/Kconfig13
-rw-r--r--drivers/input/Makefile1
-rw-r--r--drivers/input/input-polldev.c (renamed from drivers/input/misc/input-polldev.c)0
-rw-r--r--drivers/input/misc/Kconfig11
-rw-r--r--drivers/input/misc/Makefile1
5 files changed, 14 insertions, 12 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 0e9b69535ad6..3cfff40695ec 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -38,6 +38,19 @@ config INPUT_FF_MEMLESS
38 To compile this driver as a module, choose M here: the 38 To compile this driver as a module, choose M here: the
39 module will be called ff-memless. 39 module will be called ff-memless.
40 40
41config INPUT_POLLDEV
42 tristate "Polled input device skeleton"
43 help
44 Say Y here if you are using a driver for an input
45 device that periodically polls hardware state. This
46 option is only useful for out-of-tree drivers since
47 in-tree drivers select it automatically.
48
49 If unsure, say N.
50
51 To compile this driver as a module, choose M here: the
52 module will be called input-polldev.
53
41comment "Userland interfaces" 54comment "Userland interfaces"
42 55
43config INPUT_MOUSEDEV 56config INPUT_MOUSEDEV
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 8a2dd987546c..15eb752697b3 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_INPUT) += input-core.o
8input-core-objs := input.o ff-core.o 8input-core-objs := input.o ff-core.o
9 9
10obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o 10obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o
11obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o
11 12
12obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o 13obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o
13obj-$(CONFIG_INPUT_JOYDEV) += joydev.o 14obj-$(CONFIG_INPUT_JOYDEV) += joydev.o
diff --git a/drivers/input/misc/input-polldev.c b/drivers/input/input-polldev.c
index b773d4c756a6..b773d4c756a6 100644
--- a/drivers/input/misc/input-polldev.c
+++ b/drivers/input/input-polldev.c
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6013ace94d98..98ddafa30535 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -165,17 +165,6 @@ config INPUT_UINPUT
165 To compile this driver as a module, choose M here: the 165 To compile this driver as a module, choose M here: the
166 module will be called uinput. 166 module will be called uinput.
167 167
168config INPUT_POLLDEV
169 tristate "Polled input device skeleton"
170 help
171 Say Y here if you are using a driver for an input
172 device that periodically polls hardware state. This
173 option is only useful for out-of-tree drivers since
174 in-tree drivers select it automatically.
175
176 To compile this driver as a module, choose M here: the
177 module will be called input-polldev.
178
179config HP_SDC_RTC 168config HP_SDC_RTC
180 tristate "HP SDC Real Time Clock" 169 tristate "HP SDC Real Time Clock"
181 depends on GSC || HP300 170 depends on GSC || HP300
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 8b2f7799e25c..3585b5038418 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -4,7 +4,6 @@
4 4
5# Each configuration option enables a list of files. 5# Each configuration option enables a list of files.
6 6
7obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o
8obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o 7obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o
9obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o 8obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o
10obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o 9obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o