From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 04:01:03 +0000 (+1100)
Subject: Merge remote-tracking branch 'input/next'
X-Git-Tag: next-20111213~47
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9594be47820291525ffb2345aaae4d7b4ec93d32;p=karo-tx-linux.git

Merge remote-tracking branch 'input/next'

Conflicts:
	drivers/input/keyboard/samsung-keypad.c
---

9594be47820291525ffb2345aaae4d7b4ec93d32
diff --cc drivers/input/keyboard/samsung-keypad.c
index 8a0060cd3982,a6e010e016f8..aa936ee9446f
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@@ -21,10 -21,8 +21,10 @@@
  #include <linux/module.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
 +#include <linux/of.h>
 +#include <linux/of_gpio.h>
  #include <linux/sched.h>
- #include <plat/keypad.h>
+ #include <linux/input/samsung-keypad.h>
  
  #define SAMSUNG_KEYIFCON			0x00
  #define SAMSUNG_KEYIFSTSCLR			0x04
@@@ -578,24 -440,11 +578,22 @@@ static int samsung_keypad_resume(struc
  
  	return 0;
  }
- 
- static const struct dev_pm_ops samsung_keypad_pm_ops = {
- 	.suspend	= samsung_keypad_suspend,
- 	.resume		= samsung_keypad_resume,
- };
  #endif
  
 +#ifdef CONFIG_OF
 +static const struct of_device_id samsung_keypad_dt_match[] = {
 +	{ .compatible = "samsung,s3c6410-keypad" },
 +	{ .compatible = "samsung,s5pv210-keypad" },
 +	{},
 +};
 +MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
 +#else
 +#define samsung_keypad_dt_match NULL
 +#endif
 +
+ static SIMPLE_DEV_PM_OPS(samsung_keypad_pm_ops,
+ 			 samsung_keypad_suspend, samsung_keypad_resume);
+ 
  static struct platform_device_id samsung_keypad_driver_ids[] = {
  	{
  		.name		= "samsung-keypad",
@@@ -614,10 -463,7 +612,8 @@@ static struct platform_driver samsung_k
  	.driver		= {
  		.name	= "samsung-keypad",
  		.owner	= THIS_MODULE,
 +		.of_match_table = samsung_keypad_dt_match,
- #ifdef CONFIG_PM
  		.pm	= &samsung_keypad_pm_ops,
- #endif
  	},
  	.id_table	= samsung_keypad_driver_ids,
  };
diff --cc drivers/input/tablet/wacom_wac.c
index 2ee47d01a3b4,a22e7789d91b..88672ec296c1
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -1614,8 -1775,8 +1778,9 @@@ const struct usb_device_id wacom_ids[] 
  	{ USB_DEVICE_WACOM(0xE2) },
  	{ USB_DEVICE_WACOM(0xE3) },
  	{ USB_DEVICE_WACOM(0xE6) },
 +	{ USB_DEVICE_WACOM(0xEC) },
  	{ USB_DEVICE_WACOM(0x47) },
+ 	{ USB_DEVICE_WACOM(0xF4) },
  	{ USB_DEVICE_LENOVO(0x6004) },
  	{ }
  };