diff options
| author | David S. Miller | 2008-09-20 01:17:12 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-09-20 01:17:12 +0200 |
| commit | d950f264ff7260d8c1e124158d758db13e1ad2d0 (patch) | |
| tree | 8a8758af70d72b94e51609a5088a5739d00d8793 /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | qlge: Protect qlge_resume() with CONFIG_PM (diff) | |
| parent | libertas: correct "limited range of data type" warning (diff) | |
| download | kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.gz kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.xz kernel-qcow2-linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 6f296cef76ad..1359a3768404 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h @@ -483,7 +483,7 @@ struct rt2x00intf_conf { /* * Interface type */ - enum ieee80211_if_types type; + enum nl80211_iftype type; /* * TSF sync value, this is dependant on the operation type. |