aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-11-23 13:48:39 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-11-23 13:48:39 -0200
commit1323024fd3296537dd34da70fe70b4df12a308ec (patch)
tree170145f5f3ab0f5f36cfd779747025b25bc89443 /drivers
parentRevert "[media] siano: fix build with allmodconfig" (diff)
downloadlinux-dev-1323024fd3296537dd34da70fe70b4df12a308ec.tar.xz
linux-dev-1323024fd3296537dd34da70fe70b4df12a308ec.zip
[media] siano: fix build with allmodconfig
As reported by Stephen: After merging the v4l-dvb tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "sms_ir_exit" [drivers/media/common/siano/smsmdtv.ko] undefined! ERROR: "sms_ir_event" [drivers/media/common/siano/smsmdtv.ko] undefined! ERROR: "sms_ir_init" [drivers/media/common/siano/smsmdtv.ko] undefined! The smsir file should be part of the smsmdtv core, if RC is defined. Fix it. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/siano/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/siano/Makefile b/drivers/media/common/siano/Makefile
index 9e7fdf24a6b7..81b1e985bea5 100644
--- a/drivers/media/common/siano/Makefile
+++ b/drivers/media/common/siano/Makefile
@@ -3,7 +3,7 @@ smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o
obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
ifeq ($(CONFIG_SMS_SIANO_RC),y)
- obj-$(CONFIG_SMS_SIANO_MDTV) += smsir.o
+ smsmdtv-objs += smsir.o
endif
ccflags-y += -Idrivers/media/dvb-core