Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 642562d83ec4..4ee2e48c4b39 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -724,12 +724,14 @@ void timer_interrupt(int irq, struct pt_regs *regs)
         unsigned long tick_mask = tick_ops->softint_mask;
         int cpu = smp_processor_id();
         struct clock_event_device *evt = &per_cpu(sparc64_events, cpu);
+        struct irq_desc *desc;
 
         clear_softint(tick_mask);
 
         irq_enter();
 
-        kstat_this_cpu.irqs[0]++;
+        desc = irq_to_desc(0);
+        kstat_incr_irqs_this_cpu(0, desc);
 
         if (unlikely(!evt->event_handler)) {
                 printk(KERN_WARNING
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 8d3e4c6f237e..ecb1f6fd6276 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
         netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
         nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
         netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-        netdev->vlan_rx_register = nes_netdev_vlan_rx_register;
-        netdev->features |= NETIF_F_LLTX;
 
         /* Fill in the port structure */
         nesvnic->netdev = netdev;