Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / winbond / mds_s.h

diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h
index e2de4bd23b4dc944df98e7b108188799f2ec8609..eeedf01863651172fd53d31a806ed2363817579c 100644 (file)
--- a/drivers/staging/winbond/mds_s.h
+++ b/drivers/staging/winbond/mds_s.h
@@ -107,10 +107,6 @@ struct wb35_mds {
        u8      TxRate[((MAX_USB_TX_DESCRIPTOR + 1) & ~0x01)][2]; /* [0] current tx rate, [1] fall back rate */
        u8      TxInfo[((MAX_USB_TX_DESCRIPTOR + 1) & ~0x01)]; /*Store information for callback function */
 
-       /* for scanning mechanism */
-       u8      TxToggle;       /* It is TRUE if there are tx activities in some time interval */
-       u8      Reserved_[3];
-
        /* ---- for Tx Parameter */
        u16     TxFragmentThreshold;    /* For frame body only */
        u16     TxRTSThreshold;