skeletonfb: wrong field name fix

[linux-2.6-omap-h63xx.git] / drivers / edac / i3000_edac.c

diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
index d410bf7c44631f69b4a02fe3fdebd1e01b620acf..e895f9f887abb8dbda0c45706e649a8cff8fd9c8 100644 (file)
--- a/drivers/edac/i3000_edac.c
+++ b/drivers/edac/i3000_edac.c
@@ -151,7 +151,7 @@ static const struct i3000_dev_info i3000_devs[] = {
                .ctl_name = "i3000"},
 };
 
-static struct pci_dev *mci_pdev = NULL;
+static struct pci_dev *mci_pdev;
 static int i3000_registered = 1;
 static struct edac_pci_ctl_info *i3000_pci;
 
@@ -275,7 +275,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
        unsigned char *c0dra = dra, *c1dra = &dra[I3000_RANKS_PER_CHANNEL / 2];
        unsigned char *c0drb = drb, *c1drb = &drb[I3000_RANKS_PER_CHANNEL];
        unsigned long mchbar;
-       void *window;
+       void __iomem *window;
 
        debugf0("MC: %s()\n", __func__);
 
@@ -309,7 +309,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
         */
        interleaved = i3000_is_interleaved(c0dra, c1dra, c0drb, c1drb);
        nr_channels = interleaved ? 2 : 1;
-       mci = edac_mc_alloc(0, I3000_RANKS / nr_channels, nr_channels);
+       mci = edac_mc_alloc(0, I3000_RANKS / nr_channels, nr_channels, 0);
        if (!mci)
                return -ENOMEM;
 
@@ -370,7 +370,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
                         I3000_ERRSTS_BITS);
 
        rc = -ENODEV;
-       if (edac_mc_add_mc(mci, 0)) {
+       if (edac_mc_add_mc(mci)) {
                debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__);
                goto fail;
        }