Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --combined drivers/net/smc911x.c
index 48e08c06c9c13a6a74220852a4303c8422261d8f,c50758e53208ecb75cd4e081ef2dd94293d179cd..613d9028f0edfa878e5653c33388b124b5b079bd
--- 1/drivers/net/smc911x.c
--- 2/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@@ -148,7 -148,7 +148,7 @@@ static int smc911x_init(struct eth_devi
  {
        struct chip_id *id = dev->priv;
  
-         printf(DRIVERNAME ": detected %s controller\n", id->name);
+       printf(DRIVERNAME ": detected %s controller\n", id->name);
  
        smc911x_reset(dev);
  
@@@ -270,12 -270,6 +270,12 @@@ int smc911x_initialize(u8 dev_num, int 
        dev->recv = smc911x_rx;
        sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
  
 +      /* Try to detect chip. Will fail if not present. */
 +      if (smc911x_detect_chip(dev)) {
 +              free(dev);
 +              return 0;
 +      }
 +
        eth_register(dev);
        return 0;
  }