From 345c23280f5d2852e8b8cd628362bc2b0f351dbc Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 7 Jun 2007 09:42:20 -0300 Subject: Fix broken b2c2 dependency on non x86 architectures From: Mauro Carvalho Chehab As reported by Geert Uytterhoeven : drivers/media/dvb/b2c2/flexcop-dma.c uses the PCI DMA API, but DVB_B2C2_FLEXCOP doesn't depend on PCI, causing the following problem on PCI-less systems: | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' Apparently this is the flexcop DMA core, which is used by both DVB_B2C2_FLEXCOP_PCI and DVB_B2C2_FLEXCOP_USB. This patch moves flexcop-dma (currently used only by flexcop-pci) to b2c2-flexcop-pci module, that is dependent on CONFIG_PCI. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/b2c2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/dvb/b2c2/Makefile b/linux/drivers/media/dvb/b2c2/Makefile index a342c1e7d..b367c1625 100644 --- a/linux/drivers/media/dvb/b2c2/Makefile +++ b/linux/drivers/media/dvb/b2c2/Makefile @@ -1,13 +1,13 @@ b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \ - flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o \ - flexcop-dma.o + flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o ifdef STV0297_CS2 obj-$(CONFIG_DVB_B2C2_FLEXCOP) += stv0297_cs2.o endif -b2c2-flexcop-pci-objs = flexcop-pci.o + +b2c2-flexcop-pci-objs = flexcop-pci.o flexcop-dma.o obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o b2c2-flexcop-usb-objs = flexcop-usb.o -- cgit v1.2.3