LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Simon Glass 2016-10-17 20:12:34 -06:00 committed by Tom Rini
parent b0a928a15d
commit 53302bdc48
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ax88180.c
View File

@ -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) int ax88180_initialize (bd_t * bis)
{ {
struct eth_device *dev; struct eth_device *dev;

6
drivers/usb/host/isp116x-hcd.c
View File

@ -428,10 +428,10 @@ static int isp116x_interrupt(struct isp116x *isp116x)
isp116x_write_reg16(isp116x, HCuPINTENB, 0); isp116x_write_reg16(isp116x, HCuPINTENB, 0);
irqstat = isp116x_read_reg16(isp116x, HCuPINT); irqstat = isp116x_read_reg16(isp116x, HCuPINT);
isp116x_write_reg16(isp116x, HCuPINT, irqstat); isp116x_write_reg16(isp116x, HCuPINT, irqstat);
DBG(">>>>>> irqstat %x <<<<<<", irqstat); DBG("------ irqstat %x ------", irqstat);
if (irqstat & HCuPINT_ATL) { if (irqstat & HCuPINT_ATL) {
DBG(">>>>>> HCuPINT_ATL <<<<<<"); DBG("------ HCuPINT_ATL ------");
udelay(500); udelay(500);
ret = 1; ret = 1;
} }
@ -439,7 +439,7 @@ static int isp116x_interrupt(struct isp116x *isp116x)
if (irqstat & HCuPINT_OPR) { if (irqstat & HCuPINT_OPR) {
intstat = isp116x_read_reg32(isp116x, HCINTSTAT); intstat = isp116x_read_reg32(isp116x, HCINTSTAT);
isp116x_write_reg32(isp116x, HCINTSTAT, intstat); isp116x_write_reg32(isp116x, HCINTSTAT, intstat);
DBG(">>>>>> HCuPINT_OPR %x <<<<<<", intstat); DBG("------ HCuPINT_OPR %x ------", intstat);
if (intstat & HCINT_UE) { if (intstat & HCINT_UE) {
ERR("unrecoverable error, controller disabled"); ERR("unrecoverable error, controller disabled");