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

Conflicts:

	cpu/arm_cortexa8/s5pc1xx/cache.c
	include/asm-arm/arch-s5pc1xx/sys_proto.h
	include/sja1000.h

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --combined drivers/net/smc911x.c
index 613d9028f0edfa878e5653c33388b124b5b079bd,5d51406f6fab04a150b648dde3ec7a2e0d6bf526..d674ce2297b89e456e5d0d9e8e7725b3e80643ea
--- 1/drivers/net/smc911x.c
--- 2/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@@ -37,7 -37,7 +37,7 @@@ void pkt_data_push(struct eth_device *d
  
  #define mdelay(n)       udelay((n)*1000)
  
- static void smx911x_handle_mac_address(struct eth_device *dev)
+ static void smc911x_handle_mac_address(struct eth_device *dev)
  {
        unsigned long addrh, addrl;
        uchar *m = dev->enetaddr;
@@@ -155,7 -155,7 +155,7 @@@ static int smc911x_init(struct eth_devi
        /* Configure the PHY, initialize the link state */
        smc911x_phy_configure(dev);
  
-       smx911x_handle_mac_address(dev);
+       smc911x_handle_mac_address(dev);
  
        /* Turn on Tx + Rx */
        smc911x_enable(dev);
@@@ -243,7 -243,7 +243,7 @@@ int smc911x_initialize(u8 dev_num, int 
        dev = malloc(sizeof(*dev));
        if (!dev) {
                free(dev);
-               return 0;
+               return -1;
        }
        memset(dev, 0, sizeof(*dev));
  
@@@ -270,12 -270,6 +270,12 @@@
        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;
+       return 1;
  }