diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 22:41:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 22:41:27 -0700 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /drivers/media/video/omap3isp/Makefile | |
| parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| download | blackbird-op-linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.tar.gz blackbird-op-linux-c362495586e8a3a6487a318fcd82eaf15ffe2142.zip | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/video/omap3isp/Makefile')
| -rw-r--r-- | drivers/media/video/omap3isp/Makefile | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/video/omap3isp/Makefile b/drivers/media/video/omap3isp/Makefile deleted file mode 100644 index e8847e79e31a..000000000000 --- a/drivers/media/video/omap3isp/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Makefile for OMAP3 ISP driver - -ccflags-$(CONFIG_VIDEO_OMAP3_DEBUG) += -DDEBUG - -omap3-isp-objs += \ - isp.o ispqueue.o ispvideo.o \ - ispcsiphy.o ispccp2.o ispcsi2.o \ - ispccdc.o isppreview.o ispresizer.o \ - ispstat.o isph3a_aewb.o isph3a_af.o isphist.o - -obj-$(CONFIG_VIDEO_OMAP3) += omap3-isp.o |
