From 16fd921bd3a266d321071739cf40785abce4bcb1 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 24 Jul 2012 15:10:27 +0100 Subject: hw/escc: Drop duplicate definition of 'disabled' property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- hw/escc.c | 1 - 1 file changed, 1 deletion(-) (limited to 'hw') diff --git a/hw/escc.c b/hw/escc.c index 4d8a8e8886..e1f5e73ba2 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), -- cgit v1.2.3