From: Tracey Dent Date: Fri, 8 Oct 2010 00:01:29 +0000 (-0400) Subject: Staging: go7007: Makefile: makefile cleanup X-Git-Tag: v2.6.37-rc1~60^2~3^2~228 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=accca6c2f18b8a44ab92a79be2458fb547106e84;hp=bdc1b7bde2174d19d5566acc3d51d041f9a9bbf5;p=pandora-kernel.git Staging: go7007: Makefile: makefile cleanup Changed -objs to -y in Makefile. Also, Replace EXTRA_CFLAGS with ccflags-y Signed-off-by: Tracey Dent Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/go7007/Makefile b/drivers/staging/go7007/Makefile index d37b7edc2793..60a91853570d 100644 --- a/drivers/staging/go7007/Makefile +++ b/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