From bbc1ef38b57976937da4efcf7f5ed5992e16c1d5 Mon Sep 17 00:00:00 2001 From: Tracey Dent Date: Thu, 7 Oct 2010 20:01:29 -0400 Subject: [PATCH] --- yaml --- r: 220219 b: refs/heads/master c: accca6c2f18b8a44ab92a79be2458fb547106e84 h: refs/heads/master i: 220217: 0384584851d756fc6f2d858a52f8608a4685c58e 220215: 535af07c6a8716a4dec7065d05002881ccc624f8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/go7007/Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7437dde48d90..59708734f288 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdc1b7bde2174d19d5566acc3d51d041f9a9bbf5 +refs/heads/master: accca6c2f18b8a44ab92a79be2458fb547106e84 diff --git a/trunk/drivers/staging/go7007/Makefile b/trunk/drivers/staging/go7007/Makefile index d37b7edc2793..60a91853570d 100644 --- a/trunk/drivers/staging/go7007/Makefile +++ b/trunk/drivers/staging/go7007/Makefile @@ -14,10 +14,10 @@ obj-$(CONFIG_VIDEO_GO7007_UDA1342) += wis-uda1342.o obj-$(CONFIG_VIDEO_GO7007_SONY_TUNER) += wis-sony-tuner.o obj-$(CONFIG_VIDEO_GO7007_TW2804) += wis-tw2804.o -go7007-objs += go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \ +go7007-y := go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \ snd-go7007.o -s2250-objs += s2250-board.o +s2250-y := s2250-board.o # Uncomment when the saa7134 patches get into upstream #ifneq ($(CONFIG_VIDEO_SAA7134),) @@ -27,8 +27,8 @@ s2250-objs += s2250-board.o # S2250 needs cypress ezusb loader from dvb-usb ifneq ($(CONFIG_VIDEO_GO7007_USB_S2250_BOARD),) -EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb +ccflags-y := -Idrivers/media/dvb/dvb-usb endif -EXTRA_CFLAGS += -Idrivers/media/dvb/frontends -EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core +ccflags-y += -Idrivers/media/dvb/frontends +ccflags-y += -Idrivers/media/dvb/dvb-core