From 82310d5560dca6b8816162a7d4ed5be59af935f9 Mon Sep 17 00:00:00 2001 From: Dzianis Kahanovich Date: Wed, 27 Oct 2010 20:33:05 -0600 Subject: [PATCH] --- yaml --- r: 218627 b: refs/heads/master c: 87acf5ad87b275660e2508e6935b570a20b6a073 h: refs/heads/master i: 218625: ef871b40cc7ffb37afee0e040cc2d3d643569cb7 218623: b377a332f4e96139fd39d86fdd61c50c10e3704f v: v3 --- [refs] | 2 +- trunk/drivers/dma/pch_dma.c | 1 + trunk/drivers/i2c/busses/scx200_acb.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf9b2421be3e..ddd369a796b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abbce906d05ec37289cd0c3b4e35b2db26eab19b +refs/heads/master: 87acf5ad87b275660e2508e6935b570a20b6a073 diff --git a/trunk/drivers/dma/pch_dma.c b/trunk/drivers/dma/pch_dma.c index 3533948b88ba..92b679024fed 100644 --- a/trunk/drivers/dma/pch_dma.c +++ b/trunk/drivers/dma/pch_dma.c @@ -926,6 +926,7 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev) static const struct pci_device_id pch_dma_id_table[] = { { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_8CH), 8 }, { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_4CH), 4 }, + { 0, }, }; static struct pci_driver pch_dma_driver = { diff --git a/trunk/drivers/i2c/busses/scx200_acb.c b/trunk/drivers/i2c/busses/scx200_acb.c index 4cb4bb009950..53fab518b3da 100644 --- a/trunk/drivers/i2c/busses/scx200_acb.c +++ b/trunk/drivers/i2c/busses/scx200_acb.c @@ -560,7 +560,8 @@ static const struct pci_device_id scx200_pci[] __initconst = { { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA), .driver_data = 1 }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA), - .driver_data = 2 } + .driver_data = 2 }, + { 0, } }; static struct {