Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fcde235 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: move trancevibrator.c to the proper usb directory 



It's not a input driver, so it doesn't belong in the input directory.


Cc: Sam Hocevar <sam@zoy.org>
Cc: Dmitry Torokhov <dtor@insightbb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a9fc6338

drivers/usb/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ obj-$(CONFIG_USB_KBTAB) += input/ 
obj-$(CONFIG_USB_MOUSE)		+= input/

obj-$(CONFIG_USB_MOUSE)		+= input/

obj-$(CONFIG_USB_MTOUCH)	+= input/

obj-$(CONFIG_USB_MTOUCH)	+= input/

obj-$(CONFIG_USB_POWERMATE)	+= input/

obj-$(CONFIG_USB_POWERMATE)	+= input/

obj-$(CONFIG_USB_TRANCEVIBRATOR)+= input/

obj-$(CONFIG_USB_WACOM)		+= input/

obj-$(CONFIG_USB_WACOM)		+= input/

obj-$(CONFIG_USB_XPAD)		+= input/

obj-$(CONFIG_USB_XPAD)		+= input/
@@ -66,6 +65,7 @@ obj-$(CONFIG_USB_PHIDGETSERVO) += misc/ 
obj-$(CONFIG_USB_RIO500)	+= misc/

obj-$(CONFIG_USB_RIO500)	+= misc/

obj-$(CONFIG_USB_SISUSBVGA)	+= misc/

obj-$(CONFIG_USB_SISUSBVGA)	+= misc/

obj-$(CONFIG_USB_TEST)		+= misc/

obj-$(CONFIG_USB_TEST)		+= misc/

obj-$(CONFIG_USB_TRANCEVIBRATOR)+= misc/

obj-$(CONFIG_USB_USS720)	+= misc/

obj-$(CONFIG_USB_USS720)	+= misc/





obj-$(CONFIG_USB_ATM)		+= atm/

obj-$(CONFIG_USB_ATM)		+= atm/

drivers/usb/input/Kconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -348,13 +348,3 @@ config USB_APPLETOUCH 




	  To compile this driver as a module, choose M here: the

	  To compile this driver as a module, choose M here: the

	  module will be called appletouch.
 
	  module will be called appletouch.
 


config USB_TRANCEVIBRATOR

	tristate "PlayStation 2 Trance Vibrator driver support"

	depends on USB

	help

	  Say Y here if you want to connect a PlayStation 2 Trance Vibrator

	  device to your computer's USB port.



	  To compile this driver as a module, choose M here: the

	  module will be called trancevibrator.

drivers/usb/input/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,6 @@ obj-$(CONFIG_USB_ACECAD) += acecad.o 
obj-$(CONFIG_USB_YEALINK)	+= yealink.o

obj-$(CONFIG_USB_YEALINK)	+= yealink.o

obj-$(CONFIG_USB_XPAD)		+= xpad.o

obj-$(CONFIG_USB_XPAD)		+= xpad.o

obj-$(CONFIG_USB_APPLETOUCH)	+= appletouch.o

obj-$(CONFIG_USB_APPLETOUCH)	+= appletouch.o

obj-$(CONFIG_USB_TRANCEVIBRATOR)	+= trancevibrator.o





ifeq ($(CONFIG_USB_DEBUG),y)

ifeq ($(CONFIG_USB_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

EXTRA_CFLAGS += -DDEBUG

drivers/usb/misc/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -223,6 +223,16 @@ config USB_LD 
	  To compile this driver as a module, choose M here: the

	  To compile this driver as a module, choose M here: the

	  module will be called ldusb.

	  module will be called ldusb.





config USB_TRANCEVIBRATOR

	tristate "PlayStation 2 Trance Vibrator driver support"

	depends on USB

	help

	  Say Y here if you want to connect a PlayStation 2 Trance Vibrator

	  device to your computer's USB port.



	  To compile this driver as a module, choose M here: the

	  module will be called trancevibrator.



config USB_TEST

config USB_TEST

	tristate "USB testing driver (DEVELOPMENT)"

	tristate "USB testing driver (DEVELOPMENT)"

	depends on USB && USB_DEVICEFS && EXPERIMENTAL

	depends on USB && USB_DEVICEFS && EXPERIMENTAL

drivers/usb/misc/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_PHIDGETMOTORCONTROL) += phidgetmotorcontrol.o 
obj-$(CONFIG_USB_PHIDGETSERVO)	+= phidgetservo.o

obj-$(CONFIG_USB_PHIDGETSERVO)	+= phidgetservo.o

obj-$(CONFIG_USB_RIO500)	+= rio500.o

obj-$(CONFIG_USB_RIO500)	+= rio500.o

obj-$(CONFIG_USB_TEST)		+= usbtest.o

obj-$(CONFIG_USB_TEST)		+= usbtest.o

obj-$(CONFIG_USB_TRANCEVIBRATOR)	+= trancevibrator.o

obj-$(CONFIG_USB_USS720)	+= uss720.o

obj-$(CONFIG_USB_USS720)	+= uss720.o





obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/

obj-$(CONFIG_USB_SISUSBVGA)	+= sisusbvga/