diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 20:02:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 20:03:08 +0200 |
| commit | c9494727cf293ae2ec66af57547a3e79c724fec2 (patch) | |
| tree | 44ae197b64fa7530ee695a90ad31326dda06f1e1 /drivers/net/chelsio/espi.c | |
| parent | 6427462bfa50f50dc6c088c07037264fcc73eca1 (diff) | |
| parent | 42be79e37e264557f12860fa4cc84b4de3685954 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/chelsio/espi.c')
| -rw-r--r-- | drivers/net/chelsio/espi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c index 1e0749e000b..639ff195573 100644 --- a/drivers/net/chelsio/espi.c +++ b/drivers/net/chelsio/espi.c @@ -76,7 +76,7 @@ static int tricn_write(adapter_t *adapter, int bundle_addr, int module_addr, } while (busy && --attempts); if (busy) - CH_ERR("%s: TRICN write timed out\n", adapter->name); + pr_err("%s: TRICN write timed out\n", adapter->name); return busy; } @@ -86,7 +86,7 @@ static int tricn_init(adapter_t *adapter) int i, sme = 1; if (!(readl(adapter->regs + A_ESPI_RX_RESET) & F_RX_CLK_STATUS)) { - CH_ERR("%s: ESPI clock not ready\n", adapter->name); + pr_err("%s: ESPI clock not ready\n", adapter->name); return -1; } |