diff options
| author | Simon Glass <sjg@chromium.org> | 2016-10-17 20:12:34 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-23 18:33:18 -0400 |
| commit | 53302bdc480ac8c36ec4da8bd444c63f7872ba02 (patch) | |
| tree | 48a48bcf9369a018d2c8ba90f5cf5ea90f8a6ae2 /drivers/usb | |
| parent | b0a928a15d7825c08f3be1a3ec5c4bcd8b465fd8 (diff) | |
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 0556f328e4..32874d73de 100644 --- 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"); |