Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[mv-sheeva.git] / drivers / edac / i5000_edac.c

diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index d68e8bad6f43d4d34de5034e3fdea2159e2af2ea..a1f24c42d5ff45176984727961c245df1d0908fc 100644 (file)
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -338,8 +338,6 @@ struct i5000_pvt {
        struct pci_dev *branch_0;       /* 21.0 */
        struct pci_dev *branch_1;       /* 22.0 */
 
-       int node_id;            /* ID of this node */
-
        u16 tolm;               /* top of low memory */
        u64 ambase;             /* AMB BAR */
 
@@ -1319,7 +1317,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
                __func__, num_channels, num_dimms_per_channel, num_csrows);
 
        /* allocate a new MC control structure */
-       mci = edac_mc_alloc(sizeof(*pvt), num_csrows, num_channels);
+       mci = edac_mc_alloc(sizeof(*pvt), num_csrows, num_channels, 0);
 
        if (mci == NULL)
                return -ENOMEM;
@@ -1366,7 +1364,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
        }
 
        /* add this new MC control structure to EDAC's list of MCs */
-       if (edac_mc_add_mc(mci, pvt->node_id)) {
+       if (edac_mc_add_mc(mci)) {
                debugf0("MC: " __FILE__
                        ": %s(): failed edac_mc_add_mc()\n", __func__);
                /* FIXME: perhaps some code should go here that disables error
@@ -1464,7 +1462,7 @@ MODULE_DEVICE_TABLE(pci, i5000_pci_tbl);
  *
  */
 static struct pci_driver i5000_driver = {
-       .name = __stringify(KBUILD_BASENAME),
+       .name = KBUILD_BASENAME,
        .probe = i5000_init_one,
        .remove = __devexit_p(i5000_remove_one),
        .id_table = i5000_pci_tbl,