From 53302bdc480ac8c36ec4da8bd444c63f7872ba02 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 17 Oct 2016 20:12:34 -0600 Subject: 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 Reviewed-by: Tom Rini Reviewed-by: Jagan Teki --- drivers/net/ax88180.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c index 43a67a514b..261fde00c1 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; -- cgit