diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-22 22:43:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-22 22:43:17 +0400 |
| commit | 70a3067d55b31839720db1502eafd76f36a8c1af (patch) | |
| tree | ca7ea0d7a1b4e1c034db6b8f71a561b278d19f78 /drivers/media/platform/s5p-jpeg/Makefile | |
| parent | b8ff768b5ab9d17204c1a8b3647ee6db608f63ab (diff) | |
| parent | bb69ee27b96110c509d5b92c9ee541d81a821706 (diff) | |
| download | linux-70a3067d55b31839720db1502eafd76f36a8c1af.tar.xz | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"Another set of fixes for Kernel 3.10.
This series contain:
- two Kbuild fixes for randconfig
- a buffer overflow when using rtl28xuu with r820t tuner
- one clk fixup on exynos4-is driver"
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] Fix build when drivers are builtin and frontend modules
[media] s5p makefiles: don't override other selections on obj-[ym]
[media] exynos4-is: Fix FIMC-IS clocks initialization
[media] rtl28xxu: fix buffer overflow when probing Rafael Micro r820t tuner
Diffstat (limited to 'drivers/media/platform/s5p-jpeg/Makefile')
| -rw-r--r-- | drivers/media/platform/s5p-jpeg/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platform/s5p-jpeg/Makefile index ddc2900d88a2..d18cb5edd2d5 100644 --- a/drivers/media/platform/s5p-jpeg/Makefile +++ b/drivers/media/platform/s5p-jpeg/Makefile @@ -1,2 +1,2 @@ s5p-jpeg-objs := jpeg-core.o -obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) := s5p-jpeg.o +obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg.o |