diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-31 17:31:02 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-31 17:31:02 -1000 |
| commit | af3998909772f766f27ba432f281d60098354269 (patch) | |
| tree | 8cafac0135aeae7c0c5fd4797b427ca797d33d6c /drivers/media/dvb/siano/Makefile | |
| parent | 1a37f184fa7824982a5f434c06981ec46a66cef7 (diff) | |
| parent | d95c5b0b905aa9b70521eeb83ad4aea85f5e5fd0 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (12564a): MAINTAINERS: Update gspca sn9c20x name style
V4L/DVB (12502): gspca - sn9c20x: Fix gscpa sn9c20x build errors.
V4L/DVB (12495): em28xx: Don't call em28xx_ir_init when disable_ir is true
V4L/DVB (12457): zr364: wrong indexes
V4L/DVB (12451): Update KConfig File to enable SDIO and USB interfaces
V4L/DVB (12450): Siano: Fixed SDIO compilation bugs
V4L/DVB (12449): adds webcam for Micron device MT9M111 0x143A to em28xx
V4L/DVB (12446): sms1xxx: restore GPIO functionality for all Hauppauge devices
Diffstat (limited to 'drivers/media/dvb/siano/Makefile')
| -rw-r--r-- | drivers/media/dvb/siano/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/dvb/siano/Makefile index c6644d90943..c54140b5ab5 100644 --- a/drivers/media/dvb/siano/Makefile +++ b/drivers/media/dvb/siano/Makefile @@ -1,8 +1,9 @@ -sms1xxx-objs := smscoreapi.o sms-cards.o smsendian.o smsir.o -obj-$(CONFIG_DVB_SIANO_SMS1XXX) += sms1xxx.o -obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsusb.o -obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsdvb.o +smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o smsir.o + +obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o +obj-$(CONFIG_SMS_USB_DRV) += smsusb.o +obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |