Merge commit 'v2.6.29-rc1' into core/urgent

1 files changed, 0 insertions, 11 deletions

diff --git a/include/net/netdma.h b/include/net/netdma.h
index f28c6e064e8f..8ba8ce284eeb 100644
--- a/include/net/netdma.h
+++ b/include/net/netdma.h
@@ -24,17 +24,6 @@
 #include <linux/dmaengine.h>
 #include <linux/skbuff.h>
 
-static inline struct dma_chan *get_softnet_dma(void)
-{
-        struct dma_chan *chan;
-        rcu_read_lock();
-        chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma);
-        if (chan)
-                dma_chan_get(chan);
-        rcu_read_unlock();
-        return chan;
-}
-
 int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
                 struct sk_buff *skb, int offset, struct iovec *to,
                 size_t len, struct dma_pinned_list *pinned_list);