diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-25 16:20:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-25 16:20:41 +1000 |
| commit | b3f5d1bea9631022198ccf1160db6e5163e334ea (patch) | |
| tree | de8fb28a80622afe74963c78a30280ef7b7c1062 /drivers/staging/Makefile | |
| parent | 6fb212813333179684879237b18d1712c61e3ad2 (diff) | |
| parent | 19464c2d243f08d8caad28f5c002c44e93470967 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 2241ae1b21ee..82a8b8d1aef1 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -20,17 +20,19 @@ obj-$(CONFIG_OTUS) += otus/ obj-$(CONFIG_RT2860) += rt2860/ obj-$(CONFIG_RT2870) += rt2870/ obj-$(CONFIG_RT3070) += rt3070/ +obj-$(CONFIG_RT3090) += rt3090/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_ASUS_OLED) += asus_oled/ obj-$(CONFIG_PANEL) += panel/ obj-$(CONFIG_ALTERA_PCIE_CHDMA) += altpciechdma/ obj-$(CONFIG_RTL8187SE) += rtl8187se/ obj-$(CONFIG_RTL8192SU) += rtl8192su/ +obj-$(CONFIG_RTL8192E) += rtl8192e/ obj-$(CONFIG_USB_RSPI) += rspiusb/ obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_TRANZPORT) += frontier/ -obj-$(CONFIG_EPL) += epl/ obj-$(CONFIG_ANDROID) += android/ +obj-$(CONFIG_ANDROID) += dream/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/ @@ -40,8 +42,14 @@ obj-$(CONFIG_PLAN9AUTH) += p9auth/ obj-$(CONFIG_HECI) += heci/ 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_USB_CPC) += cpc-usb/ -obj-$(CONFIG_RDC_17F3101X) += pata_rdc/ obj-$(CONFIG_FB_UDL) += udlfb/ +obj-$(CONFIG_HYPERV) += hv/ +obj-$(CONFIG_VME) += vme/ +obj-$(CONFIG_RAR_REGISTER) += rar/ +obj-$(CONFIG_DX_SEP) += sep/ +obj-$(CONFIG_IIO) += iio/ |