Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h
index fbb683953fb2..2feead617a3b 100644
--- a/drivers/net/wireless/p54/p54pci.h
+++ b/drivers/net/wireless/p54/p54pci.h
@@ -92,7 +92,7 @@ struct p54p_priv {
         struct p54_common common;
         struct pci_dev *pdev;
         struct p54p_csr __iomem *map;
-        struct tasklet_struct rx_tasklet;
+        struct tasklet_struct tasklet;
         const struct firmware *firmware;
         spinlock_t lock;
         struct p54p_ring_control *ring_control;
@@ -101,8 +101,8 @@ struct p54p_priv {
         u32 rx_idx_mgmt, tx_idx_mgmt;
         struct sk_buff *rx_buf_data[8];
         struct sk_buff *rx_buf_mgmt[4];
-        void *tx_buf_data[32];
-        void *tx_buf_mgmt[4];
+        struct sk_buff *tx_buf_data[32];
+        struct sk_buff *tx_buf_mgmt[4];
         struct completion boot_comp;
 };