Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / agnx / agnx.h

diff --git a/drivers/staging/agnx/agnx.h b/drivers/staging/agnx/agnx.h
index 20f36da62475aacb34d0dfbf5913b3b237562535..3963d2597a1105da0e5a1a34eb361e4d913e2e5c 100644 (file)
--- a/drivers/staging/agnx/agnx.h
+++ b/drivers/staging/agnx/agnx.h
@@ -41,16 +41,16 @@ static const struct ieee80211_rate agnx_rates_80211g[] = {
 /*     { .bitrate = 20, .hw_value = 2, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, */
 /*     { .bitrate = 55, .hw_value = 3, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, */
 /*     { .bitrate = 110, .hw_value = 4, .flags = IEEE80211_RATE_SHORT_PREAMBLE }, */
-       { .bitrate = 10, .hw_value = 1, },
-       { .bitrate = 20, .hw_value = 2, },
-       { .bitrate = 55, .hw_value = 3, },
-       { .bitrate = 110, .hw_value = 4,},
+       { .bitrate = 10, .hw_value = 1, },
+       { .bitrate = 20, .hw_value = 2, },
+       { .bitrate = 55, .hw_value = 3, },
+       { .bitrate = 110, .hw_value = 4,},
 
        { .bitrate = 60, .hw_value = 0xB, },
        { .bitrate = 90, .hw_value = 0xF, },
        { .bitrate = 120, .hw_value = 0xA },
        { .bitrate = 180, .hw_value = 0xE, },
-//     { .bitrate = 240, .hw_value = 0xd, },
+/*     { .bitrate = 240, .hw_value = 0xd, }, */
        { .bitrate = 360, .hw_value = 0xD, },
        { .bitrate = 480, .hw_value = 0x8, },
        { .bitrate = 540, .hw_value = 0xC, },
@@ -110,10 +110,10 @@ struct agnx_priv {
        /* Need volatile? */
        u32 irq_status;
 
-        struct delayed_work periodic_work; /* Periodic tasks like recalibrate*/
+       struct delayed_work periodic_work; /* Periodic tasks like recalibrate */
        struct ieee80211_low_level_stats stats;
 
-//        unsigned int phymode;
+       /* unsigned int phymode; */
        int mode;
        int channel;
        u8 bssid[ETH_ALEN];