Merge branch 'upstream'

[linux-2.6] / drivers / net / mv643xx_eth.c

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 7c9dbc8c9423ae005a5be12175dc3c33397b367c..71f2c6705bc32ba018788e0283c76e71871af507 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -39,6 +39,8 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
+#include <linux/platform_device.h>
+
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/pgtable.h>
@@ -94,7 +96,7 @@ static char mv643xx_driver_version[] = "1.0";
 static void __iomem *mv643xx_eth_shared_base;
 
 /* used to protect MV643XX_ETH_SMI_REG, which is shared across ports */
-static spinlock_t mv643xx_eth_phy_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(mv643xx_eth_phy_lock);
 
 static inline u32 mv_read(int offset)
 {
@@ -1533,6 +1535,9 @@ static int mv643xx_eth_probe(struct device *ddev)
        printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
 #endif
 
+       if (mp->tx_sram_size > 0)
+               printk(KERN_NOTICE "%s: Using SRAM\n", dev->name);
+
        return 0;
 
 out: