summaryrefslogtreecommitdiff
path: root/arch/arm/configs/gemini_defconfig
diff options
context:
space:
mode:
authorLeon Romanovsky <leonro@nvidia.com>2021-10-21 08:27:39 +0300
committerLeon Romanovsky <leonro@nvidia.com>2021-10-21 08:27:39 +0300
commit60dd57c7479418e2bc902143eb46a2fdcfeecbbb (patch)
treeab6005faf6076a4c93fdfbcdccc1ff4bc044c8ec /arch/arm/configs/gemini_defconfig
parentb8dfed636fc6239396c3a2ae5f812505906cf215 (diff)
parentae0579acde812bc1efd074086ae3bc5eae170f20 (diff)
Merge brank 'mlx5_mkey' into rdma.git for-next
A small series to clean up the mlx5 mkey code across the mlx5_core and InfiniBand. * branch 'mlx5_mkey': RDMA/mlx5: Attach ndescs to mlx5_ib_mkey RDMA/mlx5: Move struct mlx5_core_mkey to mlx5_ib RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key RDMA/mlx5: Remove pd from struct mlx5_core_mkey RDMA/mlx5: Remove size from struct mlx5_core_mkey RDMA/mlx5: Remove iova from struct mlx5_core_mkey Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Diffstat (limited to 'arch/arm/configs/gemini_defconfig')
-rw-r--r--arch/arm/configs/gemini_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/gemini_defconfig b/arch/arm/configs/gemini_defconfig
index d2d5f1cf815f..e6ff844821cf 100644
--- a/arch/arm/configs/gemini_defconfig
+++ b/arch/arm/configs/gemini_defconfig
@@ -76,6 +76,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_DRM=y
CONFIG_DRM_PANEL_ILITEK_IL9322=y
CONFIG_DRM_TVE200=y
+CONFIG_FB=y
CONFIG_LOGO=y
CONFIG_USB=y
CONFIG_USB_MON=y