diff options
| author | Simon Glass <[email protected]> | 2016-10-17 20:12:34 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2016-10-23 18:33:18 -0400 |
| commit | 53302bdc480ac8c36ec4da8bd444c63f7872ba02 (patch) | |
| tree | 48a48bcf9369a018d2c8ba90f5cf5ea90f8a6ae2 /drivers/net | |
| 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 <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Jagan Teki <[email protected]>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ax88180.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c index 43a67a514bb..261fde00c15 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; |