Skip to content

Commit 1f69aab

Browse files
committed
Merge tag 'imx-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig update for 5.15: - Enable LTC3676 PMIC, SCSI_LOWLEVEL and KPROBES support in imx_v6_v7_defconfig. * tag 'imx-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: enable driver of the LTC3676 PMIC ARM: imx_v6_v7_defconfig: Let CONFIG_SCSI_LOWLEVEL be selected ARM: imx_v6_v7_defconfig: Select CONFIG_KPROBES Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 03bc43c + 7fd19c5 commit 1f69aab

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ CONFIG_VFP=y
5353
CONFIG_NEON=y
5454
CONFIG_PM_DEBUG=y
5555
CONFIG_PM_TEST_SUSPEND=y
56+
CONFIG_KPROBES=y
5657
CONFIG_MODULES=y
5758
CONFIG_MODULE_UNLOAD=y
5859
CONFIG_MODVERSIONS=y
@@ -119,7 +120,6 @@ CONFIG_BLK_DEV_SD=y
119120
CONFIG_SCSI_CONSTANTS=y
120121
CONFIG_SCSI_LOGGING=y
121122
CONFIG_SCSI_SCAN_ASYNC=y
122-
# CONFIG_SCSI_LOWLEVEL is not set
123123
CONFIG_ATA=y
124124
CONFIG_SATA_AHCI_PLATFORM=y
125125
CONFIG_AHCI_IMX=y
@@ -252,6 +252,7 @@ CONFIG_REGULATOR_DA9052=y
252252
CONFIG_REGULATOR_DA9062=y
253253
CONFIG_REGULATOR_DA9063=y
254254
CONFIG_REGULATOR_GPIO=y
255+
CONFIG_REGULATOR_LTC3676=y
255256
CONFIG_REGULATOR_MC13783=y
256257
CONFIG_REGULATOR_MC13892=y
257258
CONFIG_REGULATOR_PFUZE100=y

0 commit comments

Comments
 (0)