mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-04 04:04:19 +00:00
a0efa2f362
The wireless-next tree was based on something older, and there are now conflicts between -rc2 and work here. Merge net-next, which has enough of -rc2 for the conflicts to happen, resolving them in the process. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
23 lines
742 B
Makefile
23 lines
742 B
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
# Makefile for staging directory
|
|
|
|
obj-y += media/
|
|
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
|
|
obj-$(CONFIG_RTL8723BS) += rtl8723bs/
|
|
obj-$(CONFIG_R8712U) += rtl8712/
|
|
obj-$(CONFIG_RTS5208) += rts5208/
|
|
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
|
|
obj-$(CONFIG_VT6655) += vt6655/
|
|
obj-$(CONFIG_VT6656) += vt6656/
|
|
obj-$(CONFIG_VME_BUS) += vme_user/
|
|
obj-$(CONFIG_IIO) += iio/
|
|
obj-$(CONFIG_FB_SM750) += sm750fb/
|
|
obj-$(CONFIG_MFD_NVEC) += nvec/
|
|
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
|
|
obj-$(CONFIG_FB_TFT) += fbtft/
|
|
obj-$(CONFIG_MOST) += most/
|
|
obj-$(CONFIG_GREYBUS) += greybus/
|
|
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
|
|
obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
|
|
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
|