Commit 72fb39ea authored Jun 07, 2007 by Mauro Carvalho Chehab

V4L/DVB (5761): Fix broken b2c2 dependency on non x86 architectures



This patch moves flexcop-dma (currently used only by flexcop-pci) to
b2c2-flexcop-pci module, that is dependent on CONFIG_PCI, fixing the bug 
as reported by Geert Uytterhoeven <geert@linux-m68k.org>:

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.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

parent f2100d82

drivers/media/dvb/b2c2/Makefile

+5 −2

Original line number	Diff line number	Diff line
		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

		ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)
		b2c2-flexcop-objs += flexcop-dma.o
		endif

		b2c2-flexcop-pci-objs = flexcop-pci.o
		obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o