Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / drivers / staging / cx25821 / Makefile

diff --git a/drivers/staging/cx25821/Makefile b/drivers/staging/cx25821/Makefile
index 10f87f05d8e8e31ecda97d57c14aee4317bcd87b..d0eb16eac092ae75bc86684255e7048ab3b8269d 100644 (file)
--- a/drivers/staging/cx25821/Makefile
+++ b/drivers/staging/cx25821/Makefile
@@ -1,9 +1,8 @@
-cx25821-objs   := cx25821-core.o cx25821-cards.o cx25821-i2c.o cx25821-gpio.o                          \
-                               cx25821-medusa-video.o cx25821-video.o cx25821-video0.o cx25821-video1.o    \
-                               cx25821-video2.o cx25821-video3.o cx25821-video4.o cx25821-video5.o         \
-                               cx25821-video6.o cx25821-video7.o cx25821-vidups9.o cx25821-vidups10.o      \
-                               cx25821-audups11.o cx25821-video-upstream.o cx25821-video-upstream-ch2.o        \
-                               cx25821-audio-upstream.o cx25821-videoioctl.o
+cx25821-objs   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
+                      cx25821-gpio.o cx25821-medusa-video.o \
+                      cx25821-video.o cx25821-video-upstream.o \
+                      cx25821-video-upstream-ch2.o \
+                      cx25821-audio-upstream.o
 
 obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
 obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o