From: Peter Maydell Date: Tue, 24 Jul 2012 14:10:27 +0000 (+0100) Subject: hw/escc: Drop duplicate definition of 'disabled' property X-Git-Tag: v1.2.0-rc0~121 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16fd921bd3a266d321071739cf40785abce4bcb1;p=thirdparty%2Fqemu.git hw/escc: Drop duplicate definition of 'disabled' property Drop a duplicate definition of the 'disabled' property from the escc qdev property list: this redefinition is currently effectively ignored but will become an error. (The duplication was inadvertently introduced in 2009 in commit ec02f7dec2.) Signed-off-by: Peter Maydell Acked-by: Andreas Färber Signed-off-by: Blue Swirl --- diff --git a/hw/escc.c b/hw/escc.c index 4d8a8e88867..e1f5e73ba2c 100644 --- a/hw/escc.c +++ b/hw/escc.c @@ -905,7 +905,6 @@ static Property escc_properties[] = { DEFINE_PROP_UINT32("frequency", SerialState, frequency, 0), DEFINE_PROP_UINT32("it_shift", SerialState, it_shift, 0), DEFINE_PROP_UINT32("disabled", SerialState, disabled, 0), - DEFINE_PROP_UINT32("disabled", SerialState, disabled, 0), DEFINE_PROP_UINT32("chnBtype", SerialState, chn[0].type, 0), DEFINE_PROP_UINT32("chnAtype", SerialState, chn[1].type, 0), DEFINE_PROP_CHR("chrB", SerialState, chn[0].chr),