diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-28 22:28:52 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-28 22:29:19 +0400 |
| commit | 3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a (patch) | |
| tree | 0058693cc9e70b7461dae551f8a19aff2efd13ca /drivers/media/usb/pwc/Makefile | |
| parent | f16f84937d769c893492160b1a8c3672e3992beb (diff) | |
| parent | e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6 (diff) | |
| download | linux-3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a.tar.xz | |
Merge branch 'master' into for-next
Sync up with Linus' tree to be able to apply Cesar's patch
against newer version of the code.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/media/usb/pwc/Makefile')
| -rw-r--r-- | drivers/media/usb/pwc/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/usb/pwc/Makefile b/drivers/media/usb/pwc/Makefile new file mode 100644 index 000000000000..d7fdbcb9edd3 --- /dev/null +++ b/drivers/media/usb/pwc/Makefile @@ -0,0 +1,4 @@ +pwc-objs += pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o +pwc-objs += pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o + +obj-$(CONFIG_USB_PWC) += pwc.o |