diff options
author | Mike Isely <isely@pobox.com> | 2006-09-03 12:33:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:30:35 -0400 |
commit | c4e4aac88737879a562760ac07e51167847f193d (patch) | |
tree | 02b09b04dc8fc487fcd9878941ab619b3c537dc4 /drivers/media | |
parent | 1e9dadbe7a0afa0c3eeae538164d8b9d489d3cc0 (diff) |
V4L/DVB (4604): Fix broken pvrusb2 build
Fix broken build when 24XXX support is not selected. This is required
due to the requirement of removing 24XXX ifdef's from the driver
source.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/pvrusb2/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile index 02e414210dac..69b3e43cd0eb 100644 --- a/drivers/media/video/pvrusb2/Makefile +++ b/drivers/media/video/pvrusb2/Makefile | |||
@@ -1,10 +1,6 @@ | |||
1 | obj-pvrusb2-sysfs-$(CONFIG_VIDEO_PVRUSB2_SYSFS) := pvrusb2-sysfs.o | 1 | obj-pvrusb2-sysfs-$(CONFIG_VIDEO_PVRUSB2_SYSFS) := pvrusb2-sysfs.o |
2 | obj-pvrusb2-debugifc-$(CONFIG_VIDEO_PVRUSB2_DEBUGIFC) := pvrusb2-debugifc.o | 2 | obj-pvrusb2-debugifc-$(CONFIG_VIDEO_PVRUSB2_DEBUGIFC) := pvrusb2-debugifc.o |
3 | 3 | ||
4 | obj-pvrusb2-24xxx-$(CONFIG_VIDEO_PVRUSB2_24XXX) := \ | ||
5 | pvrusb2-cx2584x-v4l.o \ | ||
6 | pvrusb2-wm8775.o | ||
7 | |||
8 | pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ | 4 | pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ |
9 | pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \ | 5 | pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \ |
10 | pvrusb2-encoder.o pvrusb2-video-v4l.o \ | 6 | pvrusb2-encoder.o pvrusb2-video-v4l.o \ |
@@ -12,7 +8,7 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ | |||
12 | pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ | 8 | pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ |
13 | pvrusb2-ctrl.o pvrusb2-std.o \ | 9 | pvrusb2-ctrl.o pvrusb2-std.o \ |
14 | pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \ | 10 | pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \ |
15 | $(obj-pvrusb2-24xxx-y) \ | 11 | pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \ |
16 | $(obj-pvrusb2-sysfs-y) $(obj-pvrusb2-debugifc-y) | 12 | $(obj-pvrusb2-sysfs-y) $(obj-pvrusb2-debugifc-y) |
17 | 13 | ||
18 | obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o | 14 | obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o |