diff options
| -rw-r--r-- | drivers/dma/pch_dma.c | 1 | ||||
| -rw-r--r-- | drivers/i2c/busses/scx200_acb.c | 3 | ||||
| -rw-r--r-- | kernel/module.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c index 3533948b88ba..92b679024fed 100644 --- a/drivers/dma/pch_dma.c +++ b/drivers/dma/pch_dma.c | |||
| @@ -926,6 +926,7 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev) | |||
| 926 | static const struct pci_device_id pch_dma_id_table[] = { | 926 | static const struct pci_device_id pch_dma_id_table[] = { |
| 927 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_8CH), 8 }, | 927 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_8CH), 8 }, |
| 928 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_4CH), 4 }, | 928 | { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_4CH), 4 }, |
| 929 | { 0, }, | ||
| 929 | }; | 930 | }; |
| 930 | 931 | ||
| 931 | static struct pci_driver pch_dma_driver = { | 932 | static struct pci_driver pch_dma_driver = { |
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index 4cb4bb009950..53fab518b3da 100644 --- a/drivers/i2c/busses/scx200_acb.c +++ b/drivers/i2c/busses/scx200_acb.c | |||
| @@ -560,7 +560,8 @@ static const struct pci_device_id scx200_pci[] __initconst = { | |||
| 560 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA), | 560 | { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA), |
| 561 | .driver_data = 1 }, | 561 | .driver_data = 1 }, |
| 562 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA), | 562 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA), |
| 563 | .driver_data = 2 } | 563 | .driver_data = 2 }, |
| 564 | { 0, } | ||
| 564 | }; | 565 | }; |
| 565 | 566 | ||
| 566 | static struct { | 567 | static struct { |
diff --git a/kernel/module.c b/kernel/module.c index 2df46301a7a4..437a74a7524a 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -2037,7 +2037,7 @@ static inline void layout_symtab(struct module *mod, struct load_info *info) | |||
| 2037 | { | 2037 | { |
| 2038 | } | 2038 | } |
| 2039 | 2039 | ||
| 2040 | static void add_kallsyms(struct module *mod, struct load_info *info) | 2040 | static void add_kallsyms(struct module *mod, const struct load_info *info) |
| 2041 | { | 2041 | { |
| 2042 | } | 2042 | } |
| 2043 | #endif /* CONFIG_KALLSYMS */ | 2043 | #endif /* CONFIG_KALLSYMS */ |
