From f8343685643f2901fe11aa9d0358cafbeaf7b4c3 Mon Sep 17 00:00:00 2001 From: Yoann Padioleau Date: Fri, 1 Jun 2007 00:46:36 -0700 Subject: parse errors in ifdefs Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Cc: "Luck, Tony" Cc: Ivan Kokshaysky Cc: Richard Henderson Cc: Russell King Cc: Ralf Baechle Cc: Jeff Garzik Cc: Jan Kara Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/net/fec_8xx/fec_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/fec_8xx/fec_main.c') diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c index 88efe9731ba..e5502af5b8e 100644 --- a/drivers/net/fec_8xx/fec_main.c +++ b/drivers/net/fec_8xx/fec_main.c @@ -550,7 +550,7 @@ static int fec_enet_rx_common(struct net_device *dev, int *budget) skbn = dev_alloc_skb(pkt_len + 2); if (skbn != NULL) { skb_reserve(skbn, 2); /* align IP header */ - skb_copy_from_linear_data(skb + skb_copy_from_linear_data(skb, skbn->data, pkt_len); /* swap */ -- cgit v1.2.3