diff --git a/arch/arm/configs/MiSTer_defconfig b/arch/arm/configs/MiSTer_defconfig
index 5c19ae4f2..a95704c27 100644
--- a/arch/arm/configs/MiSTer_defconfig
+++ b/arch/arm/configs/MiSTer_defconfig
@@ -1640,7 +1640,7 @@ CONFIG_JOYSTICK_TWIDJOY=y
 CONFIG_JOYSTICK_ZHENHUA=y
 # CONFIG_JOYSTICK_AS5011 is not set
 # CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=y
+CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 # CONFIG_JOYSTICK_PSXPAD_SPI is not set
@@ -2631,6 +2631,7 @@ CONFIG_HID_DRAGONRISE=y
 CONFIG_HID_ELECOM=y
 # CONFIG_HID_ELO is not set
 CONFIG_HID_EZKEY=y
+CONFIG_HID_VADER4=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_FTEC=y
 CONFIG_HID_GAMECUBE_ADAPTER=y
@@ -2638,11 +2639,11 @@ CONFIG_HID_GAMECUBE_ADAPTER_FF=y
 CONFIG_HID_GEMBIRD=y
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
-CONFIG_HID_GOOGLE_STADIA_FF=y
 CONFIG_HID_GUNCON2=y
 CONFIG_HID_GUNCON3=y
 CONFIG_HID_HOLTEK=y
 # CONFIG_HOLTEK_FF is not set
+CONFIG_HID_GOOGLE_STADIA_FF=y
 # CONFIG_HID_VIVALDI is not set
 # CONFIG_HID_GT683R is not set
 CONFIG_HID_KEYTOUCH=y
@@ -3987,7 +3988,6 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set