summaryrefslogtreecommitdiff
path: root/drivers/usb/misc/Makefile
blob: 3d1992750da427eee344397e55b1f9ae7385aa7c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
#
# Makefile for the rest of the USB drivers
# (the ones that don't fit into any other categories)
#
obj-$(CONFIG_USB_ADUTUX)		+= adutux.o
obj-$(CONFIG_USB_APPLEDISPLAY)		+= appledisplay.o
obj-$(CONFIG_USB_CYPRESS_CY7C63)	+= cypress_cy7c63.o
obj-$(CONFIG_USB_CYTHERM)		+= cytherm.o
obj-$(CONFIG_USB_EMI26)			+= emi26.o
obj-$(CONFIG_USB_EMI62)			+= emi62.o
obj-$(CONFIG_USB_EZUSB_FX2)		+= ezusb.o
obj-$(CONFIG_USB_FTDI_ELAN)		+= ftdi-elan.o
obj-$(CONFIG_USB_IDMOUSE)		+= idmouse.o
obj-$(CONFIG_USB_IOWARRIOR)		+= iowarrior.o
obj-$(CONFIG_USB_ISIGHTFW)		+= isight_firmware.o
obj-$(CONFIG_USB_LCD)			+= usblcd.o
obj-$(CONFIG_USB_LD)			+= ldusb.o
obj-$(CONFIG_USB_LEGOTOWER)		+= legousbtower.o
obj-$(CONFIG_USB_RIO500)		+= rio500.o
obj-$(CONFIG_USB_TEST)			+= usbtest.o
obj-$(CONFIG_USB_EHSET_TEST_FIXTURE)    += ehset.o
obj-$(CONFIG_USB_TRANCEVIBRATOR)	+= trancevibrator.o
obj-$(CONFIG_USB_USS720)		+= uss720.o
obj-$(CONFIG_USB_SEVSEG)		+= usbsevseg.o
obj-$(CONFIG_USB_YUREX)			+= yurex.o
obj-$(CONFIG_USB_HSIC_USB3503)		+= usb3503.o
obj-$(CONFIG_USB_HSIC_USB4604)		+= usb4604.o
obj-$(CONFIG_USB_CHAOSKEY)		+= chaoskey.o
obj-$(CONFIG_UCSI)			+= ucsi.o

obj-$(CONFIG_USB_SISUSBVGA)		+= sisusbvga/
obj-$(CONFIG_USB_LINK_LAYER_TEST)	+= lvstest.o
move&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/samsung')