Messages in this thread | | | Date | Wed, 12 Nov 2008 13:54:25 -0800 | From | Andrew Morton <> | Subject | Re: mmotm 2008-11-10-14-54 uploaded (i5k_amb) |
| |
On Wed, 12 Nov 2008 13:26:40 -0800 Randy Dunlap <rdunlap@xenotime.net> wrote:
> > drivers/hwmon/i5K_amb.c contains a few duplicated lines, causing: > > mmotm-2008-1112-1148/drivers/hwmon/i5k_amb.c:500: error: redefinition of 'i5k_amb_ids' > mmotm-2008-1112-1148/drivers/hwmon/i5k_amb.c:493: error: previous definition of 'i5k_amb_ids' was here > > > > static struct pci_device_id i5k_amb_ids[] __devinitdata = { > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) }, > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) }, > { 0, } > }; > MODULE_DEVICE_TABLE(pci, i5k_amb_ids); > > static struct pci_device_id i5k_amb_ids[] __devinitdata = { > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) }, > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) }, > { 0, }, > }; > > MODULE_DEVICE_TABLE(pci, i5k_amb_ids);
ok, i5k_amb-load-automatically-on-all-5000-5400-chipsets.patch got changed then merged via the i2c tree.
| |