From b05a756090fe5f60143b64a780785ede6e8ac856 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 1 Apr 2006 20:47:32 -0600 Subject: Move pvrusb2 config switches further down in v4l's Makefile From: Mike Isely Cosmetic change related to pvrusb2 to ease maintenance of the v4l build. Signed-off-by: Mike Isely --- v4l/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/v4l/Makefile b/v4l/Makefile index da000e5d6..3a26fbdbe 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -74,15 +74,6 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \ pvrusb2-ioread.o pvrusb2-debugifc.o -ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y) - EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS -endif -ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y) - EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC -endif -ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y) - EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX -endif dvb-firesat-objs := firesat.o avc_api.o cmp.o firesat-rc.o ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \ ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \ @@ -233,6 +224,17 @@ $(obj)/av7110_firm.h: $(obj)/fdump EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE endif +# for pvrusb2 +ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX +endif + ifeq ($(ARCH),) ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -- cgit v1.2.3