diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-17 01:56:03 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-17 02:26:01 -0400 |
commit | 49851ca04c7f941ef6f5ca04751b0e0fefe9d50d (patch) | |
tree | 8836961ec28ea0c15917381e29be8fdc184a86b2 /drivers/input | |
parent | 0a4dfa5ddb5fc0aff331e255da282b01a74a6cd3 (diff) |
Input: xen-kbdfront - move to drivers/input/misc
drivers/input is reserved for input core code and input handlers with
drivers belonging to one of the sub-directories.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/Kconfig | 10 | ||||
-rw-r--r-- | drivers/input/Makefile | 2 | ||||
-rw-r--r-- | drivers/input/misc/Kconfig | 13 | ||||
-rw-r--r-- | drivers/input/misc/Makefile | 1 | ||||
-rw-r--r-- | drivers/input/misc/xen-kbdfront.c (renamed from drivers/input/xen-kbdfront.c) | 0 |
5 files changed, 14 insertions, 12 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 1903c0f5b925..23e82e46656d 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
@@ -161,16 +161,6 @@ config INPUT_APMPOWER | |||
161 | To compile this driver as a module, choose M here: the | 161 | To compile this driver as a module, choose M here: the |
162 | module will be called apm-power. | 162 | module will be called apm-power. |
163 | 163 | ||
164 | config XEN_KBDDEV_FRONTEND | ||
165 | tristate "Xen virtual keyboard and mouse support" | ||
166 | depends on XEN_FBDEV_FRONTEND | ||
167 | default y | ||
168 | select XEN_XENBUS_FRONTEND | ||
169 | help | ||
170 | This driver implements the front-end of the Xen virtual | ||
171 | keyboard and mouse device driver. It communicates with a back-end | ||
172 | in another domain. | ||
173 | |||
174 | comment "Input Device Drivers" | 164 | comment "Input Device Drivers" |
175 | 165 | ||
176 | source "drivers/input/keyboard/Kconfig" | 166 | source "drivers/input/keyboard/Kconfig" |
diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 09614ce74961..0c789490e0b3 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile | |||
@@ -24,5 +24,3 @@ obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/ | |||
24 | obj-$(CONFIG_INPUT_MISC) += misc/ | 24 | obj-$(CONFIG_INPUT_MISC) += misc/ |
25 | 25 | ||
26 | obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o | 26 | obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o |
27 | |||
28 | obj-$(CONFIG_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o | ||
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index b0c6772851a9..f9cf0881b0e3 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
@@ -454,4 +454,17 @@ config INPUT_CMA3000_I2C | |||
454 | To compile this driver as a module, choose M here: the | 454 | To compile this driver as a module, choose M here: the |
455 | module will be called cma3000_d0x_i2c. | 455 | module will be called cma3000_d0x_i2c. |
456 | 456 | ||
457 | config INPUT_XEN_KBDDEV_FRONTEND | ||
458 | tristate "Xen virtual keyboard and mouse support" | ||
459 | depends on XEN_FBDEV_FRONTEND | ||
460 | default y | ||
461 | select XEN_XENBUS_FRONTEND | ||
462 | help | ||
463 | This driver implements the front-end of the Xen virtual | ||
464 | keyboard and mouse device driver. It communicates with a back-end | ||
465 | in another domain. | ||
466 | |||
467 | To compile this driver as a module, choose M here: the | ||
468 | module will be called xen-kbdfront. | ||
469 | |||
457 | endif | 470 | endif |
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 9b4797112c9a..e3f7984e6274 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile | |||
@@ -42,5 +42,6 @@ obj-$(CONFIG_INPUT_TWL4030_VIBRA) += twl4030-vibra.o | |||
42 | obj-$(CONFIG_INPUT_UINPUT) += uinput.o | 42 | obj-$(CONFIG_INPUT_UINPUT) += uinput.o |
43 | obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o | 43 | obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o |
44 | obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o | 44 | obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o |
45 | obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o | ||
45 | obj-$(CONFIG_INPUT_YEALINK) += yealink.o | 46 | obj-$(CONFIG_INPUT_YEALINK) += yealink.o |
46 | 47 | ||
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c index 7077f9bf5ead..7077f9bf5ead 100644 --- a/drivers/input/xen-kbdfront.c +++ b/drivers/input/misc/xen-kbdfront.c | |||