Commit f66dd539 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  NULL-terminate all pci_device_id tables
  (trivial) Fix compiler warning in kernel/modules.c
parents 17bb51d5 87acf5ad

drivers/dma/pch_dma.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

drivers/i2c/busses/scx200_acb.c

+2 −1
Original line number Diff line number Diff line
@@ -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 {

kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -2037,7 +2037,7 @@ static inline void layout_symtab(struct module *mod, struct load_info *info) 
{

}



static void add_kallsyms(struct module *mod, struct load_info *info)

static void add_kallsyms(struct module *mod, const struct load_info *info)

{

}

#endif /* CONFIG_KALLSYMS */