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

Commit eedab661 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: move input-polldev to drivers/input
  Input: i8042 - add ULI EV4873 to noloop list
  Input: i8042 - add ASUS P65UP5 to the noloop list
  Input: usbtouchscreen - fix fallout caused by move from drivers/usb
parents c3bff2ec 893e7c2d

drivers/input/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -39,6 +39,19 @@ config INPUT_FF_MEMLESS 
	  To compile this driver as a module, choose M here: the

	  module will be called ff-memless.



config INPUT_POLLDEV

	tristate "Polled input device skeleton"

	help

	  Say Y here if you are using a driver for an input

	  device that periodically polls hardware state. This

	  option is only useful for out-of-tree drivers since

	  in-tree drivers select it automatically.



	  If unsure, say N.



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

	  module will be called input-polldev.



comment "Userland interfaces"



config INPUT_MOUSEDEV

drivers/input/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-$(CONFIG_INPUT) += input-core.o 
input-core-objs := input.o ff-core.o



obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o

obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o



obj-$(CONFIG_INPUT_MOUSEDEV)	+= mousedev.o

obj-$(CONFIG_INPUT_JOYDEV)	+= joydev.o

drivers/input/misc/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -170,17 +170,6 @@ config INPUT_UINPUT 
	  To compile this driver as a module, choose M here: the

	  module will be called uinput.



config INPUT_POLLDEV

	tristate "Polled input device skeleton"

	help

	  Say Y here if you are using a driver for an input

	  device that periodically polls hardware state. This

	  option is only useful for out-of-tree drivers since

	  in-tree drivers select it automatically.



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

	  module will be called input-polldev.



config HP_SDC_RTC

	tristate "HP SDC Real Time Clock"

	depends on GSC || HP300

drivers/input/misc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


# Each configuration option enables a list of files.



obj-$(CONFIG_INPUT_POLLDEV)		+= input-polldev.o

obj-$(CONFIG_INPUT_SPARCSPKR)		+= sparcspkr.o

obj-$(CONFIG_INPUT_PCSPKR)		+= pcspkr.o

obj-$(CONFIG_INPUT_M68K_BEEP)		+= m68kspkr.o