diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/isdn/hisax/jade_irq.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/isdn/hisax/jade_irq.c')
| -rw-r--r-- | drivers/isdn/hisax/jade_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/jade_irq.c b/drivers/isdn/hisax/jade_irq.c index f521fc83dc76..b930da9b5aa6 100644 --- a/drivers/isdn/hisax/jade_irq.c +++ b/drivers/isdn/hisax/jade_irq.c | |||
| @@ -65,7 +65,7 @@ jade_empty_fifo(struct BCState *bcs, int count) | |||
| 65 | t += sprintf(t, "jade_empty_fifo %c cnt %d", | 65 | t += sprintf(t, "jade_empty_fifo %c cnt %d", |
| 66 | bcs->hw.hscx.hscx ? 'B' : 'A', count); | 66 | bcs->hw.hscx.hscx ? 'B' : 'A', count); |
| 67 | QuickHex(t, ptr, count); | 67 | QuickHex(t, ptr, count); |
| 68 | debugl1(cs, bcs->blog); | 68 | debugl1(cs, "%s", bcs->blog); |
| 69 | } | 69 | } |
| 70 | } | 70 | } |
| 71 | 71 | ||
| @@ -105,7 +105,7 @@ jade_fill_fifo(struct BCState *bcs) | |||
| 105 | t += sprintf(t, "jade_fill_fifo %c cnt %d", | 105 | t += sprintf(t, "jade_fill_fifo %c cnt %d", |
| 106 | bcs->hw.hscx.hscx ? 'B' : 'A', count); | 106 | bcs->hw.hscx.hscx ? 'B' : 'A', count); |
| 107 | QuickHex(t, ptr, count); | 107 | QuickHex(t, ptr, count); |
| 108 | debugl1(cs, bcs->blog); | 108 | debugl1(cs, "%s", bcs->blog); |
| 109 | } | 109 | } |
| 110 | } | 110 | } |
| 111 | 111 | ||