c8d1a12692
Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
53 lines
1.8 KiB
Makefile
53 lines
1.8 KiB
Makefile
# Makefile for staging directory
|
|
|
|
# fix for build system bug...
|
|
obj-$(CONFIG_STAGING) += staging.o
|
|
|
|
obj-$(CONFIG_ET131X) += et131x/
|
|
obj-$(CONFIG_SLICOSS) += slicoss/
|
|
obj-$(CONFIG_VIDEO_GO7007) += go7007/
|
|
obj-$(CONFIG_VIDEO_CX25821) += cx25821/
|
|
obj-$(CONFIG_VIDEO_TM6000) += tm6000/
|
|
obj-$(CONFIG_USB_IP_COMMON) += usbip/
|
|
obj-$(CONFIG_W35UND) += winbond/
|
|
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
|
|
obj-$(CONFIG_ECHO) += echo/
|
|
obj-$(CONFIG_OTUS) += otus/
|
|
obj-$(CONFIG_RT2860) += rt2860/
|
|
obj-$(CONFIG_RT2870) += rt2870/
|
|
obj-$(CONFIG_COMEDI) += comedi/
|
|
obj-$(CONFIG_ASUS_OLED) += asus_oled/
|
|
obj-$(CONFIG_PANEL) += panel/
|
|
obj-$(CONFIG_R8187SE) += rtl8187se/
|
|
obj-$(CONFIG_RTL8192SU) += rtl8192su/
|
|
obj-$(CONFIG_RTL8192U) += rtl8192u/
|
|
obj-$(CONFIG_RTL8192E) += rtl8192e/
|
|
obj-$(CONFIG_TRANZPORT) += frontier/
|
|
obj-$(CONFIG_DREAM) += dream/
|
|
obj-$(CONFIG_POHMELFS) += pohmelfs/
|
|
obj-$(CONFIG_IDE_PHISON) += phison/
|
|
obj-$(CONFIG_LINE6_USB) += line6/
|
|
obj-$(CONFIG_USB_SERIAL_QUATECH2) += serqt_usb2/
|
|
obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/
|
|
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
|
|
obj-$(CONFIG_VT6655) += vt6655/
|
|
obj-$(CONFIG_VT6656) += vt6656/
|
|
obj-$(CONFIG_FB_UDL) += udlfb/
|
|
obj-$(CONFIG_HYPERV) += hv/
|
|
obj-$(CONFIG_VME_BUS) += vme/
|
|
obj-$(CONFIG_RAR_REGISTER) += rar_register/
|
|
obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
|
|
obj-$(CONFIG_DX_SEP) += sep/
|
|
obj-$(CONFIG_IIO) += iio/
|
|
obj-$(CONFIG_RAMZSWAP) += ramzswap/
|
|
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
|
|
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
|
|
obj-$(CONFIG_BATMAN_ADV) += batman-adv/
|
|
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop/
|
|
obj-$(CONFIG_FB_SM7XX) += sm7xx/
|
|
obj-$(CONFIG_DT3155) += dt3155/
|
|
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
|
|
obj-$(CONFIG_CRYSTALHD) += crystalhd/
|
|
obj-$(CONFIG_CXT1E1) += cxt1e1/
|
|
obj-$(CONFIG_TI_ST) += ti-st/
|
|
obj-$(CONFIG_ADIS16255) += adis16255/
|