Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

[pandora-kernel.git] / drivers / net / wireless / adm8211.h

diff --git a/drivers/net/wireless/adm8211.h b/drivers/net/wireless/adm8211.h
index 8d7c564..9b190ee 100644 (file)
--- a/drivers/net/wireless/adm8211.h
+++ b/drivers/net/wireless/adm8211.h
@@ -443,7 +443,6 @@ struct adm8211_rx_ring_info {
 struct adm8211_tx_ring_info {
        struct sk_buff *skb;
        dma_addr_t mapping;
-       struct ieee80211_tx_control tx_control;
        size_t hdrlen;
 };