def7cb8cd4
Here is the big staging tree update for the 3.7-rc1 merge window. There are a few patches in here that are outside of the staging area, namely HID and IIO patches, but all of them have been acked by the relevant subsystem maintainers. The IIO stuff is still coming in through this tree as it hasn't entirely moved out of the staging tree, but is almost there. Other than that, there wa a ton of work on the comedi drivers to make them more readable and the correct style. Doing that removed a lot of code, but we added a new driver to the staging tree, so we didn't end up with a net reduction this time around: 662 files changed, 51649 insertions(+), 26582 deletions(-) All of these patches have been in the linux-next tree already. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlBp32YACgkQMUfUDdst+ymU5QCgm8KWB+dAO8ZFbmzhhm3C0VFl wB0AoKbDj/tCiUHkJ70u/i3OHueKkpet =ut2/ -----END PGP SIGNATURE----- Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging tree update from Greg Kroah-Hartman: "Here is the big staging tree update for the 3.7-rc1 merge window. There are a few patches in here that are outside of the staging area, namely HID and IIO patches, but all of them have been acked by the relevant subsystem maintainers. The IIO stuff is still coming in through this tree as it hasn't entirely moved out of the staging tree, but is almost there. Other than that, there wa a ton of work on the comedi drivers to make them more readable and the correct style. Doing that removed a lot of code, but we added a new driver to the staging tree, so we didn't end up with a net reduction this time around: 662 files changed, 51649 insertions(+), 26582 deletions(-) All of these patches have been in the linux-next tree already. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1094 commits) staging: comedi: jr3_pci: fix iomem dereference staging: comedi: drivers: use comedi_fc.h cmdtest helpers Staging: winbond: usb_free_urb(NULL) is safe Staging: winbond: checkpatch cleanup Staging: winbond: Removed undesired spaces, lines and tabs Staging: winbond: Typo corrections in comments Staging: winbond: Changed c99 comments to c89 comments staging: r8712u: Do not queue cloned skb staging: comedi: ni_mio_common: always lock in ni_ai_poll() staging: comedi: s626: add FIXME comment staging: comedi: s626: don't dereference insn->data staging: comedi: s526: fix if() check in s526_gpct_winsn() staging: comedi: s626: cleanup comments in s626_initialize() staging: comedi: s626: remove clear of kzalloc'ed data staging: comedi: s626: remove 'WDInterval' from private data staging: comedi: s626: remove 'ChargeEnabled' from private data staging: comedi: s626: remove 'IsBoardRevA' comment staging: comedi: s626: #if 0 out the "SAA7146 BUG WORKAROUND" staging: comedi: s626: remove 'allocatedBuf' from private data staging: comedi: s626: add final attach message ...
120 lines
3.7 KiB
Makefile
120 lines
3.7 KiB
Makefile
#
|
|
# Makefile for the HID driver
|
|
#
|
|
hid-y := hid-core.o hid-input.o
|
|
|
|
ifdef CONFIG_DEBUG_FS
|
|
hid-objs += hid-debug.o
|
|
endif
|
|
|
|
obj-$(CONFIG_HID) += hid.o
|
|
obj-$(CONFIG_UHID) += uhid.o
|
|
|
|
obj-$(CONFIG_HID_GENERIC) += hid-generic.o
|
|
|
|
hid-$(CONFIG_HIDRAW) += hidraw.o
|
|
|
|
hid-logitech-y := hid-lg.o
|
|
ifdef CONFIG_LOGITECH_FF
|
|
hid-logitech-y += hid-lgff.o
|
|
endif
|
|
ifdef CONFIG_LOGIRUMBLEPAD2_FF
|
|
hid-logitech-y += hid-lg2ff.o
|
|
endif
|
|
ifdef CONFIG_LOGIG940_FF
|
|
hid-logitech-y += hid-lg3ff.o
|
|
endif
|
|
ifdef CONFIG_LOGIWHEELS_FF
|
|
hid-logitech-y += hid-lg4ff.o
|
|
endif
|
|
|
|
hid-wiimote-y := hid-wiimote-core.o
|
|
ifdef CONFIG_HID_WIIMOTE_EXT
|
|
hid-wiimote-y += hid-wiimote-ext.o
|
|
endif
|
|
ifdef CONFIG_DEBUG_FS
|
|
hid-wiimote-y += hid-wiimote-debug.o
|
|
endif
|
|
|
|
obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o
|
|
obj-$(CONFIG_HID_ACRUX) += hid-axff.o
|
|
obj-$(CONFIG_HID_APPLE) += hid-apple.o
|
|
obj-$(CONFIG_HID_AUREAL) += hid-aureal.o
|
|
obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
|
|
obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
|
|
obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
|
|
obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o
|
|
obj-$(CONFIG_HID_DRAGONRISE) += hid-dr.o
|
|
obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o
|
|
obj-$(CONFIG_HID_ELECOM) += hid-elecom.o
|
|
obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
|
|
obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
|
|
obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o
|
|
obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o
|
|
obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o
|
|
obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
|
|
obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o
|
|
obj-$(CONFIG_HID_KYE) += hid-kye.o
|
|
obj-$(CONFIG_HID_LCPOWER) += hid-lcpower.o
|
|
obj-$(CONFIG_HID_LENOVO_TPKBD) += hid-lenovo-tpkbd.o
|
|
obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o
|
|
obj-$(CONFIG_HID_LOGITECH_DJ) += hid-logitech-dj.o
|
|
obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o
|
|
obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o
|
|
obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o
|
|
obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o
|
|
obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o
|
|
obj-$(CONFIG_HID_ORTEK) += hid-ortek.o
|
|
obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o
|
|
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 \
|
|
hid-roccat-savu.o
|
|
obj-$(CONFIG_HID_SAITEK) += hid-saitek.o
|
|
obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
|
|
obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
|
|
obj-$(CONFIG_HID_SONY) += hid-sony.o
|
|
obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o
|
|
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
|
|
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
|
|
obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
|
|
obj-$(CONFIG_HID_TIVO) += hid-tivo.o
|
|
obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
|
|
obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o
|
|
obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o
|
|
obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o
|
|
obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
|
|
obj-$(CONFIG_HID_WACOM) += hid-wacom.o
|
|
obj-$(CONFIG_HID_WALTOP) += hid-waltop.o
|
|
obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o
|
|
obj-$(CONFIG_HID_SENSOR_HUB) += hid-sensor-hub.o
|
|
|
|
obj-$(CONFIG_USB_HID) += usbhid/
|
|
obj-$(CONFIG_USB_MOUSE) += usbhid/
|
|
obj-$(CONFIG_USB_KBD) += usbhid/
|
|
|