Remove some merge markers

[oweals/u-boot.git] / drivers / net / ax88180.c

diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c
index 43a67a514bb911ae766cc4d96b784d71a6d94a87..261fde00c153885f509877488cafcce0226a6372 100644 (file)
--- 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;