diff options
| author | Mauro Carvalho Chehab | 2013-04-01 14:54:14 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-04-01 14:54:14 +0200 |
| commit | f9f11dfe4831adb1531e1face9dcd9fc57665d2e (patch) | |
| tree | 3fb605d9c6c7ed70d42237de21203fa131e6eee8 /drivers/media/v4l2-core/Makefile | |
| parent | [media] si476x: Fix some config dependencies and a compile warnings (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | kernel-qcow2-linux-f9f11dfe4831adb1531e1face9dcd9fc57665d2e.tar.gz kernel-qcow2-linux-f9f11dfe4831adb1531e1face9dcd9fc57665d2e.tar.xz kernel-qcow2-linux-f9f11dfe4831adb1531e1face9dcd9fc57665d2e.zip | |
Merge tag 'v3.9-rc5' into patchwork
Linux 3.9-rc5
* tag 'v3.9-rc5': (1080 commits)
Linux 3.9-rc5
Revert "lockdep: check that no locks held at freeze time"
dw_dmac: adjust slave_id accordingly to request line base
dmaengine: dw_dma: fix endianess for DT xlate function
PNP: List Rafael Wysocki as a maintainer
rbd: don't zero-fill non-image object requests
ia64 idle: delete stale (*idle)() function pointer
Btrfs: don't drop path when printing out tree errors in scrub
target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit
Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs"
usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
mg_disk: fix error return code in mg_probe()
Btrfs: fix wrong return value of btrfs_lookup_csum()
Btrfs: fix wrong reservation of csums
Btrfs: fix double free in the btrfs_qgroup_account_ref()
Btrfs: limit the global reserve to 512mb
Btrfs: hold the ordered operations mutex when waiting on ordered extents
Btrfs: fix space accounting for unlink and rename
Btrfs: fix space leak when we fail to reserve metadata space
...
Diffstat (limited to 'drivers/media/v4l2-core/Makefile')
| -rw-r--r-- | drivers/media/v4l2-core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile index 00c4a1993d58..aa50c46314b7 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -13,7 +13,7 @@ ifeq ($(CONFIG_OF),y) videodev-objs += v4l2-of.o endif -obj-$(CONFIG_VIDEO_DEV) += videodev.o +obj-$(CONFIG_VIDEO_V4L2) += videodev.o obj-$(CONFIG_VIDEO_V4L2_INT_DEVICE) += v4l2-int-device.o obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o |