From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 19 May 2010 12:04:49 +0000 (+0200)
Subject: Merge branch 'upstream' into for-linus
X-Git-Tag: v2.6.35-rc1~454^2~5
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=7426ef52b42ebd54ba85133ffd29132e008a882c

Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-wacom.c
---

7426ef52b42ebd54ba85133ffd29132e008a882c
diff --cc drivers/hid/hid-core.c
index 143e788b729b,c625c3419a8c..69fdf1e2347b
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1290,8 -1293,8 +1288,9 @@@ static const struct hid_device_id hid_b
  	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
 +	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
diff --cc drivers/hid/hid-wacom.c
index f947d8337e21,51d7d77eb43b..1e051f1171e4
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@@ -21,7 -21,9 +21,10 @@@
  #include <linux/device.h>
  #include <linux/hid.h>
  #include <linux/module.h>
 +#include <linux/slab.h>
+ #ifdef CONFIG_HID_WACOM_POWER_SUPPLY
+ #include <linux/power_supply.h>
+ #endif
  
  #include "hid-ids.h"