git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ca94f26)
Revert "V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion"
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 22:51:37 +0000 (14:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 22:51:37 +0000 (14:51 -0800)
This reverts commit 08f1d0b99f4e2203935d86640a7fec5c233b777c

The "bt8xx/ conversion" for drivers/video/ hasn't actually percolated
all the way to this tree, so the Makefile change escaped too soon.

Build breakage noticed by Jeff Garzik <jeff@garzik.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/dvb/bt8xx/Makefile patch | blob | history

diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index 9d197ef..d188e4c 100644 (file)
--- a/drivers/media/dvb/bt8xx/Makefile
+++ b/drivers/media/dvb/bt8xx/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video/bt8xx -Idrivers/media/dvb/frontends
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video -Idrivers/media/dvb/frontends
Full containers within linux kernel