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>

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 1903c0f5b9257d2384cec4a8763cf116c2bb904e..23e82e46656dbe08236577dd0d5fdf04ca209f61 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -161,16 +161,6 @@ config INPUT_APMPOWER
          To compile this driver as a module, choose M here: the
          module will be called apm-power.
 
-config XEN_KBDDEV_FRONTEND
-       tristate "Xen virtual keyboard and mouse support"
-       depends on XEN_FBDEV_FRONTEND
-       default y
-       select XEN_XENBUS_FRONTEND
-       help
-         This driver implements the front-end of the Xen virtual
-         keyboard and mouse device driver.  It communicates with a back-end
-         in another domain.
-
 comment "Input Device Drivers"
 
 source "drivers/input/keyboard/Kconfig"

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 09614ce74961bccded0b02ecd29815f3947533a1..0c789490e0b359d60040fd82ed6c19dfb8784d04 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -24,5 +24,3 @@ obj-$(CONFIG_INPUT_TOUCHSCREEN)       += touchscreen/
 obj-$(CONFIG_INPUT_MISC)       += misc/
 
 obj-$(CONFIG_INPUT_APMPOWER)   += apm-power.o
-
-obj-$(CONFIG_XEN_KBDDEV_FRONTEND)      += xen-kbdfront.o

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index b0c6772851a99496727663941e092b46f81482e3..f9cf0881b0e3cf386a3e606d462aebf4bacd5575 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -454,4 +454,17 @@ config INPUT_CMA3000_I2C
          To compile this driver as a module, choose M here: the
          module will be called cma3000_d0x_i2c.
 
+config INPUT_XEN_KBDDEV_FRONTEND
+       tristate "Xen virtual keyboard and mouse support"
+       depends on XEN_FBDEV_FRONTEND
+       default y
+       select XEN_XENBUS_FRONTEND
+       help
+         This driver implements the front-end of the Xen virtual
+         keyboard and mouse device driver.  It communicates with a back-end
+         in another domain.
+
+         To compile this driver as a module, choose M here: the
+         module will be called xen-kbdfront.
+
 endif

diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 9b4797112c9ac14955ff7afb0b84ab616e613a89..e3f7984e627427ead449de2d6e6452d3aac1c915 100644 (file)
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -42,5 +42,6 @@ obj-$(CONFIG_INPUT_TWL4030_VIBRA)     += twl4030-vibra.o
 obj-$(CONFIG_INPUT_UINPUT)             += uinput.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)       += wistron_btns.o
 obj-$(CONFIG_INPUT_WM831X_ON)          += wm831x-on.o
+obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND)        += xen-kbdfront.o
 obj-$(CONFIG_INPUT_YEALINK)            += yealink.o
 

diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
similarity index 100%
rename from drivers/input/xen-kbdfront.c
rename to drivers/input/misc/xen-kbdfront.c