summaryrefslogtreecommitdiff
path: root/include/linux/spi
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2021-06-09 03:16:11 +0300
committerDan Williams <dan.j.williams@intel.com>2021-06-09 03:16:11 +0300
commit54ada34b4dfdb864ac602e13ff87581abe517ce9 (patch)
tree8c92ca68c13e86b71f9cbf05a1a432c3ba4ea67b /include/linux/spi
parent605a5e41db7d8c930fb80115686991c4c1d08ee4 (diff)
parent4a2c1dcfaf59be4b357400d893c3f5daff6cab6c (diff)
downloadlinux-54ada34b4dfdb864ac602e13ff87581abe517ce9.tar.xz
Merge branch 'rafael/acpica/cfmws' into for-5.14/cxl
Pick up the definition of the CXL Fixed Memory Window Structure from Rafael's ACPICA development branch.
Diffstat (limited to 'include/linux/spi')
-rw-r--r--include/linux/spi/spi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 360a3bc767ca..74239d65c7fd 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -644,8 +644,8 @@ struct spi_controller {
int *cs_gpios;
struct gpio_desc **cs_gpiods;
bool use_gpio_descriptors;
- u8 unused_native_cs;
- u8 max_native_cs;
+ s8 unused_native_cs;
+ s8 max_native_cs;
/* statistics */
struct spi_statistics statistics;