};
 
 static const struct rt2x00_ops rt2400pci_ops = {
-       .name           = KBUILD_MODNAME,
-       .max_sta_intf   = 1,
-       .max_ap_intf    = 1,
-       .eeprom_size    = EEPROM_SIZE,
-       .rf_size        = RF_SIZE,
-       .tx_queues      = NUM_TX_QUEUES,
-       .rx             = &rt2400pci_queue_rx,
-       .tx             = &rt2400pci_queue_tx,
-       .bcn            = &rt2400pci_queue_bcn,
-       .atim           = &rt2400pci_queue_atim,
-       .lib            = &rt2400pci_rt2x00_ops,
-       .hw             = &rt2400pci_mac80211_ops,
+       .name                   = KBUILD_MODNAME,
+       .max_sta_intf           = 1,
+       .max_ap_intf            = 1,
+       .eeprom_size            = EEPROM_SIZE,
+       .rf_size                = RF_SIZE,
+       .tx_queues              = NUM_TX_QUEUES,
+       .rx                     = &rt2400pci_queue_rx,
+       .tx                     = &rt2400pci_queue_tx,
+       .bcn                    = &rt2400pci_queue_bcn,
+       .atim                   = &rt2400pci_queue_atim,
+       .lib                    = &rt2400pci_rt2x00_ops,
+       .hw                     = &rt2400pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-       .debugfs        = &rt2400pci_rt2x00debug,
+       .debugfs                = &rt2400pci_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };
 
 
 };
 
 static const struct rt2x00_ops rt2500pci_ops = {
-       .name           = KBUILD_MODNAME,
-       .max_sta_intf   = 1,
-       .max_ap_intf    = 1,
-       .eeprom_size    = EEPROM_SIZE,
-       .rf_size        = RF_SIZE,
-       .tx_queues      = NUM_TX_QUEUES,
-       .rx             = &rt2500pci_queue_rx,
-       .tx             = &rt2500pci_queue_tx,
-       .bcn            = &rt2500pci_queue_bcn,
-       .atim           = &rt2500pci_queue_atim,
-       .lib            = &rt2500pci_rt2x00_ops,
-       .hw             = &rt2500pci_mac80211_ops,
+       .name                   = KBUILD_MODNAME,
+       .max_sta_intf           = 1,
+       .max_ap_intf            = 1,
+       .eeprom_size            = EEPROM_SIZE,
+       .rf_size                = RF_SIZE,
+       .tx_queues              = NUM_TX_QUEUES,
+       .rx                     = &rt2500pci_queue_rx,
+       .tx                     = &rt2500pci_queue_tx,
+       .bcn                    = &rt2500pci_queue_bcn,
+       .atim                   = &rt2500pci_queue_atim,
+       .lib                    = &rt2500pci_rt2x00_ops,
+       .hw                     = &rt2500pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-       .debugfs        = &rt2500pci_rt2x00debug,
+       .debugfs                = &rt2500pci_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };
 
 
 };
 
 static const struct rt2x00_ops rt2500usb_ops = {
-       .name           = KBUILD_MODNAME,
-       .max_sta_intf   = 1,
-       .max_ap_intf    = 1,
-       .eeprom_size    = EEPROM_SIZE,
-       .rf_size        = RF_SIZE,
-       .tx_queues      = NUM_TX_QUEUES,
-       .rx             = &rt2500usb_queue_rx,
-       .tx             = &rt2500usb_queue_tx,
-       .bcn            = &rt2500usb_queue_bcn,
-       .atim           = &rt2500usb_queue_atim,
-       .lib            = &rt2500usb_rt2x00_ops,
-       .hw             = &rt2500usb_mac80211_ops,
+       .name                   = KBUILD_MODNAME,
+       .max_sta_intf           = 1,
+       .max_ap_intf            = 1,
+       .eeprom_size            = EEPROM_SIZE,
+       .rf_size                = RF_SIZE,
+       .tx_queues              = NUM_TX_QUEUES,
+       .rx                     = &rt2500usb_queue_rx,
+       .tx                     = &rt2500usb_queue_tx,
+       .bcn                    = &rt2500usb_queue_bcn,
+       .atim                   = &rt2500usb_queue_atim,
+       .lib                    = &rt2500usb_rt2x00_ops,
+       .hw                     = &rt2500usb_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-       .debugfs        = &rt2500usb_rt2x00debug,
+       .debugfs                = &rt2500usb_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };
 
 
 };
 
 static const struct rt2x00_ops rt2800pci_ops = {
-       .name           = KBUILD_MODNAME,
-       .max_sta_intf   = 1,
-       .max_ap_intf    = 8,
-       .eeprom_size    = EEPROM_SIZE,
-       .rf_size        = RF_SIZE,
-       .tx_queues      = NUM_TX_QUEUES,
-       .rx             = &rt2800pci_queue_rx,
-       .tx             = &rt2800pci_queue_tx,
-       .bcn            = &rt2800pci_queue_bcn,
-       .lib            = &rt2800pci_rt2x00_ops,
-       .hw             = &rt2800_mac80211_ops,
+       .name                   = KBUILD_MODNAME,
+       .max_sta_intf           = 1,
+       .max_ap_intf            = 8,
+       .eeprom_size            = EEPROM_SIZE,
+       .rf_size                = RF_SIZE,
+       .tx_queues              = NUM_TX_QUEUES,
+       .rx                     = &rt2800pci_queue_rx,
+       .tx                     = &rt2800pci_queue_tx,
+       .bcn                    = &rt2800pci_queue_bcn,
+       .lib                    = &rt2800pci_rt2x00_ops,
+       .hw                     = &rt2800_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-       .debugfs        = &rt2800_rt2x00debug,
+       .debugfs                = &rt2800_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };
 
 
 };
 
 static const struct rt2x00_ops rt2800usb_ops = {
-       .name           = KBUILD_MODNAME,
-       .max_sta_intf   = 1,
-       .max_ap_intf    = 8,
-       .eeprom_size    = EEPROM_SIZE,
-       .rf_size        = RF_SIZE,
-       .tx_queues      = NUM_TX_QUEUES,
-       .rx             = &rt2800usb_queue_rx,
-       .tx             = &rt2800usb_queue_tx,
-       .bcn            = &rt2800usb_queue_bcn,
-       .lib            = &rt2800usb_rt2x00_ops,
-       .hw             = &rt2800_mac80211_ops,
+       .name                   = KBUILD_MODNAME,
+       .max_sta_intf           = 1,
+       .max_ap_intf            = 8,
+       .eeprom_size            = EEPROM_SIZE,
+       .rf_size                = RF_SIZE,
+       .tx_queues              = NUM_TX_QUEUES,
+       .rx                     = &rt2800usb_queue_rx,
+       .tx                     = &rt2800usb_queue_tx,
+       .bcn                    = &rt2800usb_queue_bcn,
+       .lib                    = &rt2800usb_rt2x00_ops,
+       .hw                     = &rt2800_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-       .debugfs        = &rt2800_rt2x00debug,
+       .debugfs                = &rt2800_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };
 
 
 };
 
 static const struct rt2x00_ops rt61pci_ops = {
-       .name           = KBUILD_MODNAME,
-       .max_sta_intf   = 1,
-       .max_ap_intf    = 4,
-       .eeprom_size    = EEPROM_SIZE,
-       .rf_size        = RF_SIZE,
-       .tx_queues      = NUM_TX_QUEUES,
-       .rx             = &rt61pci_queue_rx,
-       .tx             = &rt61pci_queue_tx,
-       .bcn            = &rt61pci_queue_bcn,
-       .lib            = &rt61pci_rt2x00_ops,
-       .hw             = &rt61pci_mac80211_ops,
+       .name                   = KBUILD_MODNAME,
+       .max_sta_intf           = 1,
+       .max_ap_intf            = 4,
+       .eeprom_size            = EEPROM_SIZE,
+       .rf_size                = RF_SIZE,
+       .tx_queues              = NUM_TX_QUEUES,
+       .rx                     = &rt61pci_queue_rx,
+       .tx                     = &rt61pci_queue_tx,
+       .bcn                    = &rt61pci_queue_bcn,
+       .lib                    = &rt61pci_rt2x00_ops,
+       .hw                     = &rt61pci_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-       .debugfs        = &rt61pci_rt2x00debug,
+       .debugfs                = &rt61pci_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };
 
 
 };
 
 static const struct rt2x00_ops rt73usb_ops = {
-       .name           = KBUILD_MODNAME,
-       .max_sta_intf   = 1,
-       .max_ap_intf    = 4,
-       .eeprom_size    = EEPROM_SIZE,
-       .rf_size        = RF_SIZE,
-       .tx_queues      = NUM_TX_QUEUES,
-       .rx             = &rt73usb_queue_rx,
-       .tx             = &rt73usb_queue_tx,
-       .bcn            = &rt73usb_queue_bcn,
-       .lib            = &rt73usb_rt2x00_ops,
-       .hw             = &rt73usb_mac80211_ops,
+       .name                   = KBUILD_MODNAME,
+       .max_sta_intf           = 1,
+       .max_ap_intf            = 4,
+       .eeprom_size            = EEPROM_SIZE,
+       .rf_size                = RF_SIZE,
+       .tx_queues              = NUM_TX_QUEUES,
+       .rx                     = &rt73usb_queue_rx,
+       .tx                     = &rt73usb_queue_tx,
+       .bcn                    = &rt73usb_queue_bcn,
+       .lib                    = &rt73usb_rt2x00_ops,
+       .hw                     = &rt73usb_mac80211_ops,
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-       .debugfs        = &rt73usb_rt2x00debug,
+       .debugfs                = &rt73usb_rt2x00debug,
 #endif /* CONFIG_RT2X00_LIB_DEBUGFS */
 };