From 4104d13fe0194736393d97c88ee045fb689c783b Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 7 May 2007 16:16:29 -0400 Subject: Input: move USB tablets under drivers/input/tablet This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov Acked-by: Greg Kroah-Hartman --- drivers/usb/input/Makefile | 8 -------- 1 file changed, 8 deletions(-) (limited to 'drivers/usb/input/Makefile') diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index 284a0734e0c..a9e9b2fc5e7 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -2,22 +2,14 @@ # Makefile for the USB input drivers # -# Multipart objects. -wacom-objs := wacom_wac.o wacom_sys.o - -obj-$(CONFIG_USB_AIPTEK) += aiptek.o obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o -obj-$(CONFIG_USB_KBTAB) += kbtab.o obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o obj-$(CONFIG_USB_TOUCHSCREEN) += usbtouchscreen.o obj-$(CONFIG_USB_POWERMATE) += powermate.o -obj-$(CONFIG_USB_WACOM) += wacom.o -obj-$(CONFIG_USB_ACECAD) += acecad.o obj-$(CONFIG_USB_YEALINK) += yealink.o obj-$(CONFIG_USB_XPAD) += xpad.o obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o -obj-$(CONFIG_USB_GTCO) += gtco.o ifeq ($(CONFIG_USB_DEBUG),y) EXTRA_CFLAGS += -DDEBUG -- cgit v1.2.3 From d05e84e6cb21cca16987813fd3c271ebaed4233d Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 7 May 2007 16:38:49 -0400 Subject: Input: move USB touchscreens under drivers/input/touchscreen This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov Acked-by: Greg Kroah-Hartman --- drivers/usb/input/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/usb/input/Makefile') diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index a9e9b2fc5e7..c8b843ce167 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -5,7 +5,6 @@ obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o -obj-$(CONFIG_USB_TOUCHSCREEN) += usbtouchscreen.o obj-$(CONFIG_USB_POWERMATE) += powermate.o obj-$(CONFIG_USB_YEALINK) += yealink.o obj-$(CONFIG_USB_XPAD) += xpad.o -- cgit v1.2.3 From 1c362d46825259a48c1d543cab3805a6c770c0c8 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 7 May 2007 16:48:50 -0400 Subject: Input: move USB gamepads under drivers/input/joystick This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov Acked-by: Greg Kroah-Hartman --- drivers/usb/input/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/usb/input/Makefile') diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index c8b843ce167..d2cbb0ec796 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o obj-$(CONFIG_USB_POWERMATE) += powermate.o obj-$(CONFIG_USB_YEALINK) += yealink.o -obj-$(CONFIG_USB_XPAD) += xpad.o obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o ifeq ($(CONFIG_USB_DEBUG),y) -- cgit v1.2.3 From b5da20f8f7652e7a9648401a1942b7aac3b9ab9d Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 7 May 2007 17:12:07 -0400 Subject: Input: move USB mice under drivers/input/mouse This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov Acked-by: Greg Kroah-Hartman --- drivers/usb/input/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/usb/input/Makefile') diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index d2cbb0ec796..91df130909e 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o obj-$(CONFIG_USB_POWERMATE) += powermate.o obj-$(CONFIG_USB_YEALINK) += yealink.o -obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o ifeq ($(CONFIG_USB_DEBUG),y) EXTRA_CFLAGS += -DDEBUG -- cgit v1.2.3 From ba0acb5ee318901646f82c134cca2e4de0c43934 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 7 May 2007 17:31:32 -0400 Subject: Input: move USB miscellaneous devices under drivers/input/misc This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov Acked-by: Greg Kroah-Hartman --- drivers/usb/input/Makefile | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 drivers/usb/input/Makefile (limited to 'drivers/usb/input/Makefile') diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile deleted file mode 100644 index 91df130909e..00000000000 --- a/drivers/usb/input/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for the USB input drivers -# - -obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o -obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o -obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o -obj-$(CONFIG_USB_POWERMATE) += powermate.o -obj-$(CONFIG_USB_YEALINK) += yealink.o - -ifeq ($(CONFIG_USB_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif -- cgit v1.2.3