Merge commit 'wd/master'

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

diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c
index f440ce07e2a2d323b866df55d6e91feeb5319248..4e7259fd96930bde6cdf38ff22ecb7ccfe0380dd 100644 (file)
--- a/drivers/net/vsc7385.c
+++ b/drivers/net/vsc7385.c
@@ -13,9 +13,6 @@
  */
 
 #include <config.h>
-
-#ifdef CONFIG_VSC7385_ENET
-
 #include <common.h>
 #include <asm/io.h>
 #include <asm/errno.h>
@@ -56,7 +53,7 @@ int vsc7385_upload_firmware(void *firmware, unsigned int size)
        out_be32(icpu_rom_map, 1);
        udelay(20);
 
-        /* Write the firmware to I-RAM */
+       /* Write the firmware to I-RAM */
        out_be32(icpu_addr, 0);
        udelay(20);
 
@@ -78,8 +75,8 @@ int vsc7385_upload_firmware(void *firmware, unsigned int size)
                udelay(20);
                if (value != fw[i]) {
                        debug("VSC7385: Upload mismatch: address 0x%x, "
-                              "read value 0x%x, image value 0x%x\n",
-                              i, value, fw[i]);
+                             "read value 0x%x, image value 0x%x\n",
+                             i, value, fw[i]);
 
                        return -EIO;
                }
@@ -97,5 +94,3 @@ int vsc7385_upload_firmware(void *firmware, unsigned int size)
 
        return 0;
 }
-
-#endif