diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/media/video/pvrusb2/Makefile | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/media/video/pvrusb2/Makefile')
| -rw-r--r-- | drivers/media/video/pvrusb2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile index fed603ad0a67..02e414210dac 100644 --- a/drivers/media/video/pvrusb2/Makefile +++ b/drivers/media/video/pvrusb2/Makefile | |||
| @@ -8,7 +8,7 @@ obj-pvrusb2-24xxx-$(CONFIG_VIDEO_PVRUSB2_24XXX) := \ | |||
| 8 | pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ | 8 | pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ |
| 9 | pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \ | 9 | pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \ |
| 10 | pvrusb2-encoder.o pvrusb2-video-v4l.o \ | 10 | pvrusb2-encoder.o pvrusb2-video-v4l.o \ |
| 11 | pvrusb2-eeprom.o pvrusb2-tuner.o pvrusb2-demod.o \ | 11 | pvrusb2-eeprom.o pvrusb2-tuner.o \ |
| 12 | pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ | 12 | pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ |
| 13 | pvrusb2-ctrl.o pvrusb2-std.o \ | 13 | pvrusb2-ctrl.o pvrusb2-std.o \ |
| 14 | pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \ | 14 | pvrusb2-context.o pvrusb2-io.o pvrusb2-ioread.o \ |