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

Commit 5cf0eb98 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Second round of input updates for 3.13.
parents 42249094 bd77c321

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4008,6 +4008,7 @@ F: arch/x86/include/uapi/asm/hyperv.h 
F:	arch/x86/kernel/cpu/mshyperv.c

F:	drivers/hid/hid-hyperv.c

F:	drivers/hv/

F:	drivers/input/serio/hyperv-keyboard.c

F:	drivers/net/hyperv/

F:	drivers/scsi/storvsc_drv.c

F:	drivers/video/hyperv_fb.c

drivers/input/misc/hp_sdc_rtc.c

+4 −1
Original line number Diff line number Diff line
@@ -180,7 +180,10 @@ static int64_t hp_sdc_rtc_read_i8042timer (uint8_t loadcmd, int numreg) 
	if (WARN_ON(down_interruptible(&i8042tregs)))

		return -1;



	if (hp_sdc_enqueue_transaction(&t)) return -1;

	if (hp_sdc_enqueue_transaction(&t)) {

		up(&i8042tregs);

		return -1;

	}

	

	/* Sleep until results come back. */

	if (WARN_ON(down_interruptible(&i8042tregs)))

drivers/input/touchscreen/Kconfig

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

	  module will be called stmpe-ts.



config TOUCHSCREEN_SUR40

	tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"

	depends on USB

	select INPUT_POLLDEV

	help

	  Say Y here if you want support for the Samsung SUR40 touchscreen

	  (also known as Microsoft Surface 2.0 or Microsoft PixelSense).



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

	  module will be called sur40.



config TOUCHSCREEN_TPS6507X

	tristate "TPS6507x based touchscreens"

	depends on I2C

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ obj-$(CONFIG_TOUCHSCREEN_PIXCIR) += pixcir_i2c_ts.o 
obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o

obj-$(CONFIG_TOUCHSCREEN_ST1232)	+= st1232.o

obj-$(CONFIG_TOUCHSCREEN_STMPE)		+= stmpe-ts.o

obj-$(CONFIG_TOUCHSCREEN_SUR40)		+= sur40.o

obj-$(CONFIG_TOUCHSCREEN_TI_AM335X_TSC)	+= ti_am335x_tsc.o

obj-$(CONFIG_TOUCHSCREEN_TNETV107X)	+= tnetv107x-ts.o

obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)	+= touchit213.o

drivers/input/touchscreen/atmel-wm97xx.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int __exit atmel_wm97xx_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM_SLEEP

static int atmel_wm97xx_suspend(struct *dev)

static int atmel_wm97xx_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev);