From 11ab7cc2521393d447cd011255ccd1f18785a408 Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz>
Date: Mar 01 2023 21:10:43 +0000
Subject: Merge branches 'users/jslaby/master/for-next' and 'users/schwab/master/for-next' into master


Pull PCMCIA driver cleanup from Jiří Slabý.
Pull a riscv64 config update from Andreas Schwab.

---

diff --git a/config/riscv64/default b/config/riscv64/default
index 4db3df3..6973d22 100644
--- a/config/riscv64/default
+++ b/config/riscv64/default
@@ -4383,10 +4383,12 @@ CONFIG_SPI_MUX=m
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_LOOPBACK_TEST=m
 # CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_TIME=m
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
 CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=m
 # CONFIG_SPMI_HISI3670 is not set