From e80d1b193f5b675aa3a1f2fe5bacdcf0261ff1b6 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 24 Jul 2006 15:30:28 -0700
Subject: [PATCH] --- yaml --- r: 32819 b: refs/heads/master c:
 37182d1bd3264cf9c0dce3408bee48af0755de7e h: refs/heads/master i:   32817:
 8916646c92874c304a420de74e4e969764eb7e4b   32815:
 567f67f2a9564cb46e5551d696016af067e2f3e1 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ae51ef65bdb6..10f099291687 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c753c3d3be0f8d1b570ec5720ad1bb4caf8232b
+refs/heads/master: 37182d1bd3264cf9c0dce3408bee48af0755de7e
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 0bf31b83578c..f98757976647 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -1066,7 +1066,6 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
 		kfree_skb(skb);
 }
 
-#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB
 /**
  *	__dev_alloc_skb - allocate an skbuff for sending
  *	@length: length to allocate
@@ -1087,9 +1086,6 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
 		skb_reserve(skb, NET_SKB_PAD);
 	return skb;
 }
-#else
-extern struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask);
-#endif
 
 /**
  *	dev_alloc_skb - allocate an skbuff for sending