git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
Makefile
diff --git
a/drivers/media/video/Makefile
b/drivers/media/video/Makefile
index 9b1f3f06bb7ce267d5dc868be48b4e2dd6965cc4..44ccaed40b49f798d61f7debb51b509d5f91730c 100644
(file)
--- a/
drivers/media/video/Makefile
+++ b/
drivers/media/video/Makefile
@@
-113,4
+113,3
@@
obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/
obj-$(CONFIG_VIDEO_VIVI) += vivi.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT