From 153dc99a3e9f2606fe50e347478a9f19664e3898 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Tue, 9 Aug 2011 09:02:46 -0500 Subject: [PATCH] bad merge resolution in hw/escc.c --- hw/escc.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/escc.c b/hw/escc.c index 377b1490ac..b13389ae54 100644 --- a/hw/escc.c +++ b/hw/escc.c @@ -683,18 +683,6 @@ static int serial_event(void *opaque, int event, void *data) return 0; } -static CPUReadMemoryFunc * const escc_mem_read[3] = { - escc_mem_readb, - NULL, - NULL, -}; - -static CPUWriteMemoryFunc * const escc_mem_write[3] = { - escc_mem_writeb, - NULL, - NULL, -}; - static const VMStateDescription vmstate_escc_chn = { .name ="escc_chn", .version_id = 2, -- 2.11.4.GIT