xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/hspi', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', 'spi/topic/oc-tiny', 'spi/topic/omap', 'spi/topic/orion' and 'spi/topic/pci' into spi-linus

Browse Source
This commit is contained in:
Mark Brown
2014-01-23 13:07:09 +00:00
parent 36e66bf84f 714bb654e9 ba1271bb05 c6c07b4f6d e1d0cd473b 50a7799829 7c7ccc52fc e826a7ff69 84acfd4340 bb489841b1 9a21e4770a
commit 907e26b6f5
16 changed files with 156 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-dw-pci.c
View File

@@ -125,7 +125,7 @@ static int spi_resume(struct pci_dev *pdev)
#define spi_resume NULL
#endif
static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
static const struct pci_device_id pci_ids[] = {
/* Intel MID platform SPI controller 0 */
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
{},