diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:47:33 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:47:33 -0500 |
| commit | 210b3a70383b0bcc4266856431491b39dcb4f14d (patch) | |
| tree | 43bca90787d6d55b78883870180611b156b8373b /hw | |
| parent | bdc792d3875ee0e8c824bcd7820ab08ff2bd5e24 (diff) | |
| parent | add8d262035a0c4e3ccad26b4b4a5644f4a66185 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm_pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm_pic.c b/hw/arm_pic.c index 985148a380..41f8d3e112 100644 --- a/hw/arm_pic.c +++ b/hw/arm_pic.c @@ -39,7 +39,7 @@ static void arm_pic_cpu_handler(void *opaque, int irq, int level) cpu_reset_interrupt(env, CPU_INTERRUPT_FIQ); break; default: - hw_error("arm_pic_cpu_handler: Bad interrput line %d\n", irq); + hw_error("arm_pic_cpu_handler: Bad interrupt line %d\n", irq); } } |