2006-03-21 22:19:54

by Jeff Garzik

[permalink] [raw]
Subject: [PATCH] fix dvb build


Fixes 'allmodconfig' build in current git
(ec1248e70edc5cf7b485efcc7b41e44e10f422e5).

Signed-off-by: Jeff Garzik <[email protected]>

diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
index 9d197ef..d188e4c 100644
--- 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


2006-03-21 22:25:30

by Manu Abraham

[permalink] [raw]
Subject: Re: [PATCH] fix dvb build

Hello Jeff,

Jeff Garzik wrote:
> Fixes 'allmodconfig' build in current git
> (ec1248e70edc5cf7b485efcc7b41e44e10f422e5).
>
> Signed-off-by: Jeff Garzik <[email protected]>
>
> diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile
> index 9d197ef..d188e4c 100644
> --- 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
>
>

The relocation patch is there in akpm's (mm) tree, but not in linus's
tree .. importing the patch from the mm tree will fix the problem.


Manu


2006-03-21 22:52:14

by Linus Torvalds

[permalink] [raw]
Subject: Re: [PATCH] fix dvb build



On Tue, 21 Mar 2006, Jeff Garzik wrote:
>
> Fixes 'allmodconfig' build in current git

Hmm. That's just a revert of 08f1d0b:

V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion

which seems to be a premature Makefile fix for a bt8xxx/ conversion that
hasn't even happened yet in the main tree.

I'll revert that commit for now.

Linus