Revert "UBUNTU: SAUCE: (efi-lockdown) Add a SysRq option to lift kernel lockdown"

[mirror_ubuntu-bionic-kernel.git] / debian.master / config / armhf / config.common.armhf

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 7515fe90f62bc99dc6e6df8dc27ad5898aa21ea5..83e558265e83fa29f8d23ae82af0fbc27c383de4 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -8,7 +8,6 @@ CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_AIX_PARTITION=y
 CONFIG_ALIM7101_WDT=m
-# CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ is not set
 CONFIG_ALTERA_TSE=m
 # CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_AMIGA_PARTITION=y
@@ -25,7 +24,6 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUNXI is not set
@@ -73,7 +71,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CHASH=m
 CONFIG_CMDLINE=""
 CONFIG_CMDLINE_PARTITION=y
-CONFIG_COMMON_CLK_QCOM=m
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CRAMFS=m
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
@@ -114,7 +111,6 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIXED_PHY=y
 CONFIG_FMC=m
-CONFIG_FONTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FUSION=y
 CONFIG_GAMEPORT=m
@@ -208,7 +204,6 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MT6397=m
-CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_SM501=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
@@ -217,11 +212,12 @@ CONFIG_MFD_TPS65217=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
+CONFIG_MISC_RTSX=m
+CONFIG_MISC_RTSX_PCI=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MSM_GCC_8916=m
 CONFIG_MTD=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
@@ -318,7 +314,6 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_BERLIN_BG2=y
 CONFIG_PINCTRL_BERLIN_BG2CD=y
 CONFIG_PINCTRL_BERLIN_BG2Q=y
-CONFIG_PINCTRL_MSM8916=m
 CONFIG_PM_DEBUG=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_POWERCAP=y
@@ -338,7 +333,6 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PWM=y
 CONFIG_QNX4FS_FS=m
 CONFIG_QNX6FS_FS=m
-CONFIG_R3964=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=y
@@ -420,6 +414,7 @@ CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SGL_ALLOC=y
 CONFIG_SG_SPLIT=y
 CONFIG_SH_TIMER_CMT=y
 CONFIG_SH_TIMER_MTU2=y