diff options
author | Mark Brown | 2019-03-19 14:12:32 +0100 |
---|---|---|
committer | Mark Brown | 2019-03-19 14:12:32 +0100 |
commit | 249acb5f47df27109d74a0d904a5da56c8bac28f (patch) | |
tree | bade04b7c88324eaf6f826dd69a10146edd9a819 /drivers/spi | |
parent | spi: pxa2xx-pci: Drop unused header inclusion (diff) | |
parent | Linux 5.1-rc1 (diff) | |
download | kernel-qcow2-linux-249acb5f47df27109d74a0d904a5da56c8bac28f.tar.gz kernel-qcow2-linux-249acb5f47df27109d74a0d904a5da56c8bac28f.tar.xz kernel-qcow2-linux-249acb5f47df27109d74a0d904a5da56c8bac28f.zip |
Merge tag 'v5.1-rc1' into spi-5.2
Linux 5.1-rc1
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index e7e8ea1edcce..fba3f180f233 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -92,7 +92,6 @@ #define PCH_MAX_SPBR 1023 /* Definition for ML7213/ML7223/ML7831 by LAPIS Semiconductor */ -#define PCI_VENDOR_ID_ROHM 0x10DB #define PCI_DEVICE_ID_ML7213_SPI 0x802c #define PCI_DEVICE_ID_ML7223_SPI 0x800F #define PCI_DEVICE_ID_ML7831_SPI 0x8816 |