diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-10 15:21:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-10 15:21:55 +0200 |
| commit | f78a8236c6502760705399dfa42e22ab11aa1e6b (patch) | |
| tree | d965f09daff0d531c63e35c764e7061f9c43afe7 /drivers/edac/xgene_edac.c | |
| parent | 6cb3d05f3030deed157c9bbada5c58e7ee0f5172 (diff) | |
| parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
| download | talos-op-linux-f78a8236c6502760705399dfa42e22ab11aa1e6b.tar.gz talos-op-linux-f78a8236c6502760705399dfa42e22ab11aa1e6b.zip | |
Merge 4.11-rc6 into staging-next
We want the staging and iio fixes in here to handle merging easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/edac/xgene_edac.c')
| -rw-r--r-- | drivers/edac/xgene_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c index 6c270d9d304a..669246056812 100644 --- a/drivers/edac/xgene_edac.c +++ b/drivers/edac/xgene_edac.c @@ -1596,7 +1596,7 @@ static void xgene_edac_pa_report(struct edac_device_ctl_info *edac_dev) reg = readl(ctx->dev_csr + IOBPATRANSERRINTSTS); if (!reg) goto chk_iob_axi0; - dev_err(edac_dev->dev, "IOB procesing agent (PA) transaction error\n"); + dev_err(edac_dev->dev, "IOB processing agent (PA) transaction error\n"); if (reg & IOBPA_RDATA_CORRUPT_MASK) dev_err(edac_dev->dev, "IOB PA read data RAM error\n"); if (reg & IOBPA_M_RDATA_CORRUPT_MASK) |
