diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
| commit | b99374450c03bf5081b88995d91d34fb9b2fd040 (patch) | |
| tree | b6f525d915504ad8bd99bdb2dadcca345a4ad3a3 /drivers/media/video/samsung/ump/Kconfig | |
| parent | a39819e88ea4546218b581d7f061a99ca91d825b (diff) | |
| parent | e2f984e707f517f24041b70018770b20b71cb6a6 (diff) | |
| download | kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.zip kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.gz kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.bz2 | |
Merge remote-tracking branch 'github/cm-11.0'
Conflicts:
firmware/Makefile
firmware/epen/W9001_B713.bin.ihex
firmware/epen/W9001_B746.bin.ihex
firmware/epen/W9001_B746JD.bin.ihex
firmware/epen/W9001_B746L.bin.ihex
firmware/epen/W9001_B746S.bin.ihex
Diffstat (limited to 'drivers/media/video/samsung/ump/Kconfig')
| -rw-r--r-- | drivers/media/video/samsung/ump/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/samsung/ump/Kconfig b/drivers/media/video/samsung/ump/Kconfig index 9d8e5e6..09e8daf 100644 --- a/drivers/media/video/samsung/ump/Kconfig +++ b/drivers/media/video/samsung/ump/Kconfig @@ -6,7 +6,7 @@ # For UMP config VIDEO_UMP bool "Enable UMP(Unified Memory Provider)" - default y + default n ---help--- This enables UMP memory provider |