From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Mon, 2 Jun 2008 10:12:42 +0000 (+0100)
Subject: Remove merge-duplicated dma_phony_handler
X-Git-Tag: xen-3.3.0-rc1~132
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=152dc435db9c07ff9b7128de893b4e1e4ee7c19b;p=qemu-xen-3.4-testing.git

Remove merge-duplicated dma_phony_handler
---

diff --git a/hw/dma.c b/hw/dma.c
index 433ac3d9..d2316990 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -448,13 +448,6 @@ static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
     return dma_pos;
 }
 
-static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
-{
-    dolog ("unregistered DMA channel used nchan=%d dma_pos=%d dma_len=%d\n",
-           nchan, dma_pos, dma_len);
-    return dma_pos;
-}
-
 /* dshift = 0: 8 bit DMA, 1 = 16 bit DMA */
 static void dma_init2(struct dma_cont *d, int base, int dshift,
                       int page_base, int pageh_base)