aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-06-07 16:32:53 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-18 15:14:37 +0200
commitedc92115a9300cca65946d5b2d56bec637a38f26 (patch)
tree8639bf3640d71fd65cb8e402e4867f4acb4683e0
parent7bc3018b32a007f0a6cf6ee7e431cc6dfc6e7f84 (diff)
downloadqemu-edc92115a9300cca65946d5b2d56bec637a38f26.zip
qemu-edc92115a9300cca65946d5b2d56bec637a38f26.tar.gz
qemu-edc92115a9300cca65946d5b2d56bec637a38f26.tar.bz2
arm_l2x0: Rename "type" property to "cache-type"
Resolves a name conflict with the qdev "type" property that is about to be moved to Object. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
-rw-r--r--hw/arm_l2x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm_l2x0.c b/hw/arm_l2x0.c
index 09f290c..de6a086 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(),
};