Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index d82a9a994753..97a3dfd94dfa 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -67,6 +67,7 @@
 #include <linux/highmem.h>
 #include <linux/sockios.h>
 #include <linux/firmware.h>
+#include <linux/slab.h>
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #include <linux/if_vlan.h>
@@ -134,7 +135,7 @@
 #define PCI_DEVICE_ID_SGI_ACENIC        0x0009
 #endif
 
-static struct pci_device_id acenic_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(acenic_pci_tbl) = {
         { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_FIBRE,
           PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_ETHERNET << 8, 0xffff00, },
         { PCI_VENDOR_ID_ALTEON, PCI_DEVICE_ID_ALTEON_ACENIC_COPPER,
@@ -2845,7 +2846,7 @@ static void ace_set_multicast_list(struct net_device *dev)
          * set the entire multicast list at a time and keeping track of
          * it here is going to be messy.
          */
-        if ((dev->mc_count) && !(ap->mcast_all)) {
+        if (!netdev_mc_empty(dev) && !ap->mcast_all) {
                 cmd.evt = C_SET_MULTICAST_MODE;
                 cmd.code = C_C_MCAST_ENABLE;
                 cmd.idx = 0;