Merge branches 'mmci' and 'pl011-dma' into devel

[mv-sheeva.git] / drivers / staging / easycap / Makefile

diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile
index d93bd6b70a4b3b7adefe171eeb866ef11292d756..8a3d911aee5d974e38f7386260e770e167f81ec0 100644 (file)
--- a/drivers/staging/easycap/Makefile
+++ b/drivers/staging/easycap/Makefile
@@ -1,13 +1,13 @@
 
 obj-$(CONFIG_EASYCAP)  += easycap.o
 
-easycap-objs   := easycap_main.o easycap_low.o easycap_sound.o
-easycap-objs   += easycap_ioctl.o easycap_settings.o
-easycap-objs   += easycap_testcard.o
+easycap-y      := easycap_main.o easycap_low.o easycap_sound.o
+easycap-y      += easycap_ioctl.o easycap_settings.o
+easycap-y      += easycap_testcard.o
 
-EXTRA_CFLAGS += -Wall
+ccflags-y := -Wall
 # Impose all or none of the following:
-EXTRA_CFLAGS += -DEASYCAP_IS_VIDEODEV_CLIENT
-EXTRA_CFLAGS += -DEASYCAP_NEEDS_V4L2_DEVICE_H
-EXTRA_CFLAGS += -DEASYCAP_NEEDS_V4L2_FOPS
+ccflags-y += -DEASYCAP_IS_VIDEODEV_CLIENT
+ccflags-y += -DEASYCAP_NEEDS_V4L2_DEVICE_H
+ccflags-y += -DEASYCAP_NEEDS_V4L2_FOPS