Remove some merge markers

These two files have patch merge markers in them, within comments or
strings. Remove then, so that a search for merge markers does not show up
matches in these files.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>

diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index 43a67a514bb911ae766cc4d96b784d71a6d94a87..261fde00c153885f509877488cafcce0226a6372 100644 (file)
--- a/drivers/net/ax88180.c
+++ b/drivers/net/ax88180.c
@@ -698,11 +698,7 @@ static void ax88180_read_mac_addr (struct eth_device *dev)
        }
 }
 
-/*
-===========================================================================
-<<<<<<                 Exported SubProgram Bodies              >>>>>>
-===========================================================================
-*/
+/* Exported SubProgram Bodies */
 int ax88180_initialize (bd_t * bis)
 {
        struct eth_device *dev;

diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 0556f328e459b7d23b95b20a260b56c0a74ad33a..32874d73de845eb97806477b38497b5baa6e6af9 100644 (file)
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -428,10 +428,10 @@ static int isp116x_interrupt(struct isp116x *isp116x)
        isp116x_write_reg16(isp116x, HCuPINTENB, 0);
        irqstat = isp116x_read_reg16(isp116x, HCuPINT);
        isp116x_write_reg16(isp116x, HCuPINT, irqstat);
-       DBG(">>>>>> irqstat %x <<<<<<", irqstat);
+       DBG("------ irqstat %x ------", irqstat);
 
        if (irqstat & HCuPINT_ATL) {
-               DBG(">>>>>> HCuPINT_ATL <<<<<<");
+               DBG("------ HCuPINT_ATL ------");
                udelay(500);
                ret = 1;
        }
@@ -439,7 +439,7 @@ static int isp116x_interrupt(struct isp116x *isp116x)
        if (irqstat & HCuPINT_OPR) {
                intstat = isp116x_read_reg32(isp116x, HCINTSTAT);
                isp116x_write_reg32(isp116x, HCINTSTAT, intstat);
-               DBG(">>>>>> HCuPINT_OPR %x <<<<<<", intstat);
+               DBG("------ HCuPINT_OPR %x ------", intstat);
 
                if (intstat & HCINT_UE) {
                        ERR("unrecoverable error, controller disabled");