summaryrefslogtreecommitdiffstats
path: root/hw/eepro100.c
diff options
context:
space:
mode:
authorAnthony Liguori2011-05-12 15:08:12 +0200
committerAnthony Liguori2011-05-12 15:08:12 +0200
commit711c21280b2cb56060859cc574221a8bf40f908a (patch)
tree9f5385c53ac50e613ae34d4165d02460ef993f0f /hw/eepro100.c
parentMerge remote-tracking branch 'agraf/xen-next' into staging (diff)
parentlsi53c895a: Rename 'sense' to 'status' (diff)
downloadqemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.gz
qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.xz
qemu-711c21280b2cb56060859cc574221a8bf40f908a.zip
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts: cpu-all.h
Diffstat (limited to 'hw/eepro100.c')
-rw-r--r--hw/eepro100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 05450e859e..9f16efd365 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1126,7 +1126,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