Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / net / smc91x.c

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index dc4805f..2b1d254 100644 (file)
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1425,11 +1425,6 @@ static void smc_set_multicast_list(struct net_device *dev)
                netdev_for_each_mc_addr(ha, dev) {
                        int position;
 
-                       /* make sure this is a multicast address -
-                          shouldn't this be a given if we have it here ? */
-                       if (!(*ha->addr & 1))
-                               continue;
-
                        /* only use the low order bits */
                        position = crc32_le(~0, ha->addr, 6) & 0x3f;
 
@@ -2400,8 +2395,10 @@ static const struct of_device_id smc91x_match[] = {
        { .compatible = "smsc,lan91c94", },
        { .compatible = "smsc,lan91c111", },
        {},
-}
+};
 MODULE_DEVICE_TABLE(of, smc91x_match);
+#else
+#define smc91x_match NULL
 #endif
 
 static struct dev_pm_ops smc_drv_pm_ops = {
@@ -2416,9 +2413,7 @@ static struct platform_driver smc_driver = {
                .name   = CARDNAME,
                .owner  = THIS_MODULE,
                .pm     = &smc_drv_pm_ops,
-#ifdef CONFIG_OF
                .of_match_table = smc91x_match,
-#endif
        },
 };