[U-Boot] [PATCH v3 01/29] Remove some merge markers

[Heiko Schocher]

Hello Simon,

Am 29.09.2016 um 22:23 schrieb Simon Glass:
> 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 at chromium.org>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
>   drivers/net/ax88180.c          | 6 +-----
>   drivers/usb/host/isp116x-hcd.c | 6 +++---
>   2 files changed, 4 insertions(+), 8 deletions(-)

Reviewed-by: Heiko Schocher <hs at denx.de>

bye,
Heiko
>
> diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
> index 43a67a5..261fde0 100644
> --- 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 0556f32..32874d7 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");
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany