diff --git a/core/linux-rpi/PKGBUILD b/core/linux-rpi/PKGBUILD
index daa77a1e1..5cdbdc9bb 100644
--- a/core/linux-rpi/PKGBUILD
+++ b/core/linux-rpi/PKGBUILD
@@ -9,7 +9,7 @@ _commit=ff6cb02d2b7320aa46e69a45cc5fa8d4460264b4
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 pkgver=5.15.21
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux'
 url="http://www.kernel.org/"
 arch=(armv7h aarch64)
@@ -33,9 +33,9 @@ md5sums=('b8758884bbabcff655b9ec7644d8672e'
          '86d4a35722b5410e3b29fc92dae15d4b'
          '0a5f16bfec6ad982a2f6782724cca8ba'
          '441ec084c47cddc53e592fb0cbce4edf')
-md5sums_armv7h=('344e49c41eb83ad2c5062e0801efd6f5'
+md5sums_armv7h=('bcef7bff012d9b370d7d9f31c999cbe7'
                 'a9a05a9e8487584b10a0191dd53e5170')
-md5sums_aarch64=('fe6139aaf91921703bd814a35da04e66'
+md5sums_aarch64=('fb78af4199e466d14957c5bf8688489d'
                  'a9a05a9e8487584b10a0191dd53e5170')
 
 # setup vars
diff --git a/core/linux-rpi/config b/core/linux-rpi/config
index e7d7f7430..d33b208c5 100644
--- a/core/linux-rpi/config
+++ b/core/linux-rpi/config
@@ -6113,14 +6113,14 @@ CONFIG_USB_CHAOSKEY=m
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
+CONFIG_NOP_USB_XCEIV=y
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
 # CONFIG_USB_ULPI is not set
 # end of USB Physical Layer drivers
 
-CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
diff --git a/core/linux-rpi/config8 b/core/linux-rpi/config8
index 88bfbef17..f5e044c24 100644
--- a/core/linux-rpi/config8
+++ b/core/linux-rpi/config8
@@ -6130,13 +6130,13 @@ CONFIG_USB_CHAOSKEY=m
 # USB Physical Layer drivers
 #
 CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
+CONFIG_NOP_USB_XCEIV=y
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
 # CONFIG_USB_ULPI is not set
 # end of USB Physical Layer drivers
 
-CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set