From edc92115a9300cca65946d5b2d56bec637a38f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 7 Jun 2012 16:32:53 +0200 Subject: arm_l2x0: Rename "type" property to "cache-type" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves a name conflict with the qdev "type" property that is about to be moved to Object. Signed-off-by: Andreas Färber Acked-by: Mark Langsdorf --- hw/arm_l2x0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/arm_l2x0.c') diff --git a/hw/arm_l2x0.c b/hw/arm_l2x0.c index 09f290c85f..de6a0863d8 100644 --- a/hw/arm_l2x0.c +++ b/hw/arm_l2x0.c @@ -161,7 +161,7 @@ static int l2x0_priv_init(SysBusDevice *dev) } static Property l2x0_properties[] = { - DEFINE_PROP_UINT32("type", l2x0_state, cache_type, 0x1c100100), + DEFINE_PROP_UINT32("cache-type", l2x0_state, cache_type, 0x1c100100), DEFINE_PROP_END_OF_LIST(), }; -- cgit v1.2.1