Re: [PATCH] Add support for Westmere to i7core_edac driver

[Mauro Carvalho Chehab]

Vernon Mauery wrote:
> On 18-May-2010 04:00 PM, Mauro Carvalho Chehab wrote:
>> Vernon Mauery wrote:
>>> Add support for Westmere to i7core_edac driver
>>>
>>> This adds new PCI IDs for the Westmere's memory controller
>>> devices and modifies the i7core_edac driver to be able to
>>> probe both Nehalem and Westmere processors.
>>>
>>> This applies to
>>> git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git
>>> linux_next
>>>
>>> Signed-off-by: Vernon Mauery <vernux@xxxxxxxxxx>
>>>
>>> @@ -1170,7 +1213,7 @@ static void i7core_put_all_devices(void)
>>>           i7core_put_devices(i7core_dev);
>>>   }
>>>
>>> -static void __init i7core_xeon_pci_fixup(int dev_id)
>>> +static void i7core_xeon_pci_fixup(struct pci_id_table *table)
>>>   {
>>>       struct pci_dev *pdev = NULL;
>>>       int i;
>>
>>
>> Hmm... this hunk seems wrong to me. It ir just reverting this patch:
>>
>> http://git.kernel.org/?p=linux/kernel/git/mchehab/i7core.git;a=commit;h=71753e0141a220ecbf9c71a66e0a8acce9705fb5
>>
>>
>> The other changes seem OK on my eyes.
> 
> Oops.  It looks like my merge was not quite correct.  It was not
> intended to revert that patch, but rather change the parameters to the
> function to use a struct pci_id_table instead of an int dev_id.
> 
> Here is a correct patch.

Thanks for the fix. Applied at the tree.

Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/