Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / r6040.c

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 7ac6fede6e6dd13c6ec50e7cfa3722f16f1a0d6e..cf3a082bc89d6e1df9c68c80e1e08c24f774cf39 100644 (file)
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -49,8 +49,8 @@
 #include <asm/processor.h>
 
 #define DRV_NAME       "r6040"
-#define DRV_VERSION    "0.19"
-#define DRV_RELDATE    "18Dec2008"
+#define DRV_VERSION    "0.20"
+#define DRV_RELDATE    "07Jan2009"
 
 /* PHY CHIP Address */
 #define PHY1_ADDR      1       /* For MAC1 */
@@ -1141,6 +1141,11 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
        adrp[1] = ioread16(ioaddr + MID_0M);
        adrp[2] = ioread16(ioaddr + MID_0H);
 
+       /* Some bootloader/BIOSes do not initialize
+        * MAC address, warn about that */
+       if (!(adrp[0] || adrp[1] || adrp[2]))
+               printk(KERN_WARNING DRV_NAME ": MAC address not initialized\n");
+
        /* Link new device into r6040_root_dev */
        lp->pdev = pdev;
        lp->dev = dev;