diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
| commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
| tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /hw/alpha_dp264.c | |
| parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
| parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
| download | qemu-9423a2e8dd362a271bfe194ec131062814557b95.zip qemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.gz qemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'hw/alpha_dp264.c')
| -rw-r--r-- | hw/alpha_dp264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c index fcc20e9..598b830 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha_dp264.c @@ -2,7 +2,7 @@ * QEMU Alpha DP264/CLIPPER hardware system emulator. * * Choose CLIPPER IRQ mappings over, say, DP264, MONET, or WEBBRICK - * variants because CLIPPER doesn't have an SMC669 SuperIO controler + * variants because CLIPPER doesn't have an SMC669 SuperIO controller * that we need to emulate as well. */ |