diff options
| author | Adam Ford <aford173@gmail.com> | 2019-10-03 09:30:07 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-10-03 09:56:04 -0700 |
| commit | 6f54a5afcc0b155c24a30666459b65b13ea0760c (patch) | |
| tree | 5976d974ead107b859ddfd852c18282280083de1 /arch | |
| parent | 16c1fcdade069644e967628a8ea9a74fb7a6217b (diff) | |
| download | linux-stable-6f54a5afcc0b155c24a30666459b65b13ea0760c.tar.gz linux-stable-6f54a5afcc0b155c24a30666459b65b13ea0760c.tar.bz2 linux-stable-6f54a5afcc0b155c24a30666459b65b13ea0760c.zip | |
ARM: omap2plus_defconfig: Update for moved item
When running make savedefconfig ARCH=arm, CONFIG_DMA_CMA
changed location. To help facilitate future changes to
omap2plus_defconfig, this patch re-syncs the omap2plus file
with the updated location generated by make savedefconfig.
No items were removed or added during this patch.
Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 7099f7b7f994..c9c53c9a47dd 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -128,7 +128,6 @@ CONFIG_PCI_ENDPOINT_CONFIGFS=y CONFIG_PCI_EPF_TEST=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y CONFIG_OMAP_OCP2SCP=y CONFIG_CONNECTOR=m CONFIG_MTD=y @@ -538,6 +537,7 @@ CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=y CONFIG_CRC7=y CONFIG_LIBCRC32C=y +CONFIG_DMA_CMA=y CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y |