diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-28 11:11:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-28 11:11:16 -0400 |
| commit | c487606f835a93a725bac1aefd536be98f22474d (patch) | |
| tree | c77571a519905945e24a9ea6e4e44d9032fd527d /drivers/net/wireless/rt2x00/rt61pci.c | |
| parent | d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1 (diff) | |
| parent | 97ea6d0f3eb019891038cd2dfddb749d6bf219be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/nfc/netlink.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 2673e058caaf..d6582a2fa353 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
| @@ -3045,7 +3045,6 @@ static const struct data_queue_desc rt61pci_queue_bcn = { | |||
| 3045 | 3045 | ||
| 3046 | static const struct rt2x00_ops rt61pci_ops = { | 3046 | static const struct rt2x00_ops rt61pci_ops = { |
| 3047 | .name = KBUILD_MODNAME, | 3047 | .name = KBUILD_MODNAME, |
| 3048 | .max_sta_intf = 1, | ||
| 3049 | .max_ap_intf = 4, | 3048 | .max_ap_intf = 4, |
| 3050 | .eeprom_size = EEPROM_SIZE, | 3049 | .eeprom_size = EEPROM_SIZE, |
| 3051 | .rf_size = RF_SIZE, | 3050 | .rf_size = RF_SIZE, |