git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
configs
/
defconfig
diff --git
a/arch/arm64/configs/defconfig
b/arch/arm64/configs/defconfig
index 2e9636da2147ed18d7ead944d7629fe67e95d4e5..5315789f48682ae684e319361cecef5528a35aec 100644
(file)
--- a/
arch/arm64/configs/defconfig
+++ b/
arch/arm64/configs/defconfig
@@
-1159,7
+1159,6
@@
CONFIG_XEN_GNTDEV=y
CONFIG_XEN_GRANT_DEV_ALLOC=y
CONFIG_STAGING=y
CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_IMX_MEDIA=m
CONFIG_VIDEO_MAX96712=m
CONFIG_CHROME_PLATFORMS=y
CONFIG_CROS_EC=y