From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 15 Jan 2010 13:41:58 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2010.09-rc1~28^2~7^2~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e598dfc22c8789991d165714bec53b2390fc999d;p=u-boot

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>
---

e598dfc22c8789991d165714bec53b2390fc999d
diff --cc drivers/net/smc911x.c
index 613d9028f0,5d51406f6f..d674ce2297
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@@ -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;
+ 	return 1;
  }