diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/easycap/Makefile | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/Makefile')
| -rw-r--r-- | drivers/staging/easycap/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile index d93bd6b..8a3d911 100644 --- 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 |
