mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 04:42:12 +00:00
76d21c5635
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c
75 lines
2.6 KiB
Makefile
75 lines
2.6 KiB
Makefile
# Makefile for staging directory
|
|
|
|
# fix for build system bug...
|
|
obj-$(CONFIG_STAGING) += staging.o
|
|
|
|
obj-y += tty/
|
|
obj-y += generic_serial/
|
|
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_DVB_CXD2099) += cxd2099/
|
|
obj-$(CONFIG_LIRC_STAGING) += lirc/
|
|
obj-$(CONFIG_USB_IP_COMMON) += usbip/
|
|
obj-$(CONFIG_W35UND) += winbond/
|
|
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
|
|
obj-$(CONFIG_ECHO) += echo/
|
|
obj-$(CONFIG_BRCM80211) += brcm80211/
|
|
obj-$(CONFIG_RT2860) += rt2860/
|
|
obj-$(CONFIG_RT2870) += rt2870/
|
|
obj-$(CONFIG_COMEDI) += comedi/
|
|
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
|
|
obj-$(CONFIG_ASUS_OLED) += asus_oled/
|
|
obj-$(CONFIG_PANEL) += panel/
|
|
obj-$(CONFIG_R8187SE) += rtl8187se/
|
|
obj-$(CONFIG_RTL8192U) += rtl8192u/
|
|
obj-$(CONFIG_RTL8192E) += rtl8192e/
|
|
obj-$(CONFIG_R8712U) += rtl8712/
|
|
obj-$(CONFIG_RTS_PSTOR) += rts_pstor/
|
|
obj-$(CONFIG_SPECTRA) += spectra/
|
|
obj-$(CONFIG_TRANZPORT) += frontier/
|
|
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_HYPERV) += hv/
|
|
obj-$(CONFIG_VME_BUS) += vme/
|
|
obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
|
|
obj-$(CONFIG_DX_SEP) += sep/
|
|
obj-$(CONFIG_IIO) += iio/
|
|
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio/
|
|
obj-$(CONFIG_ZRAM) += zram/
|
|
obj-$(CONFIG_XVMALLOC) += zram/
|
|
obj-$(CONFIG_ZCACHE) += zcache/
|
|
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
|
|
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
|
|
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop/
|
|
obj-$(CONFIG_FB_SM7XX) += sm7xx/
|
|
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
|
|
obj-$(CONFIG_CRYSTALHD) += crystalhd/
|
|
obj-$(CONFIG_CXT1E1) += cxt1e1/
|
|
obj-$(CONFIG_FB_XGI) += xgifb/
|
|
obj-$(CONFIG_MSM_STAGING) += msm/
|
|
obj-$(CONFIG_EASYCAP) += easycap/
|
|
obj-$(CONFIG_SOLO6X10) += solo6x10/
|
|
obj-$(CONFIG_TIDSPBRIDGE) += tidspbridge/
|
|
obj-$(CONFIG_ACPI_QUICKSTART) += quickstart/
|
|
obj-$(CONFIG_WESTBRIDGE_ASTORIA) += westbridge/astoria/
|
|
obj-$(CONFIG_SBE_2T3E3) += sbe-2t3e3/
|
|
obj-$(CONFIG_ATH6K_LEGACY) += ath6kl/
|
|
obj-$(CONFIG_USB_ENESTORAGE) += keucr/
|
|
obj-$(CONFIG_BCM_WIMAX) += bcm/
|
|
obj-$(CONFIG_FT1000) += ft1000/
|
|
obj-$(CONFIG_SND_INTEL_SST) += intel_sst/
|
|
obj-$(CONFIG_SPEAKUP) += speakup/
|
|
obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/
|
|
obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217) += cptm1217/
|
|
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/
|
|
obj-$(CONFIG_DRM_PSB) += gma500/
|