Commit 5dce2120 authored by Jeff Garzik's avatar Jeff Garzik

[netdrvr tulip] fix bogus merges

parent 590a9629
...@@ -2026,8 +2026,6 @@ set_multicast_list(struct net_device *dev) ...@@ -2026,8 +2026,6 @@ set_multicast_list(struct net_device *dev)
dev->trans_start = jiffies; dev->trans_start = jiffies;
} }
} }
return IRQ_HANDLED;
} }
/* /*
......
...@@ -197,7 +197,7 @@ static int tulip_rx(struct net_device *dev) ...@@ -197,7 +197,7 @@ static int tulip_rx(struct net_device *dev)
"do not match in tulip_rx: %08x vs. %Lx %p / %p.\n", "do not match in tulip_rx: %08x vs. %Lx %p / %p.\n",
dev->name, dev->name,
le32_to_cpu(tp->rx_ring[entry].buffer1), le32_to_cpu(tp->rx_ring[entry].buffer1),
(u64)tp->rx_buffers[entry].mapping, (long long)tp->rx_buffers[entry].mapping,
skb->head, temp); skb->head, temp);
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment