From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 1 Oct 2012 08:12:08 +0000 (+0200)
Subject: Merge branch 'ps3' into for-next
X-Git-Tag: next-20121002~74^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=45eb8ccde325b4fb15913459f219ecfccc006476;p=karo-tx-linux.git

Merge branch 'ps3' into for-next
---

45eb8ccde325b4fb15913459f219ecfccc006476
diff --cc drivers/hid/Makefile
index 3684750c976e,333ed6c961c5..5a3690ff9bf2
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -69,27 -69,8 +69,28 @@@ obj-$(CONFIG_HID_PRODIKEYS)	+= hid-prod
  obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o
  obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o
  obj-$(CONFIG_HID_PICOLCD)	+= hid-picolcd.o
 +hid-picolcd-y			+= hid-picolcd_core.o
 +ifdef CONFIG_HID_PICOLCD_FB
 +hid-picolcd-y			+= hid-picolcd_fb.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_BACKLIGHT
 +hid-picolcd-y			+= hid-picolcd_backlight.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_LCD
 +hid-picolcd-y			+= hid-picolcd_lcd.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_LEDS
 +hid-picolcd-y			+= hid-picolcd_leds.o
 +endif
 +ifdef CONFIG_HID_PICOLCD_CIR
 +hid-picolcd-y			+= hid-picolcd_cir.o
 +endif
 +ifdef CONFIG_DEBUG_FS
 +hid-picolcd-y			+= hid-picolcd_debugfs.o
 +endif
 +
  obj-$(CONFIG_HID_PRIMAX)	+= hid-primax.o
+ obj-$(CONFIG_HID_PS3REMOTE)	+= hid-ps3remote.o
  obj-$(CONFIG_HID_ROCCAT)	+= hid-roccat.o hid-roccat-common.o \
  	hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
  	hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o \