diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-06-14 17:51:11 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-06-15 18:27:15 +0300 |
| commit | 8500eb8b64de8cfb5ddde2f226d9dec075410cc9 (patch) | |
| tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /hw/eepro100.c | |
| parent | b7138d34dddfe6e98282c129c5f54bc85f45a180 (diff) | |
| parent | 616852a5af8ff35993c8d2cc24efa6bfcb4aa7c6 (diff) | |
| download | qemu-8500eb8b64de8cfb5ddde2f226d9dec075410cc9.tar.gz qemu-8500eb8b64de8cfb5ddde2f226d9dec075410cc9.tar.bz2 qemu-8500eb8b64de8cfb5ddde2f226d9dec075410cc9.zip | |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'hw/eepro100.c')
| -rw-r--r-- | hw/eepro100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/eepro100.c b/hw/eepro100.c index 84b98c0929..9b6f4a5cd8 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1112,7 +1112,7 @@ static void eepro100_write_eeprom(eeprom_t * eeprom, uint8_t val) { TRACE(EEPROM, logout("val=0x%02x\n", val)); - /* mask unwriteable bits */ + /* mask unwritable bits */ #if 0 val = SET_MASKED(val, 0x31, eeprom->value); #endif |