diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-07 17:50:51 +1000 |
| commit | eec1ba76a0f043bdea21db10df4287bb5a4d25a8 (patch) | |
| tree | 269e10ce578105322820dd426e30cf9eea7513c6 /drivers/staging/wlan-ng/p80211mgmt.h | |
| parent | 9fdbbf93bb3bb2b62335e780bb94871fc39dc5d8 (diff) | |
| parent | bb104a76ac0e6c103c36623616c7dee8cd9d165c (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/wlan-ng/p80211mgmt.h')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211mgmt.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h index c925a45b1885..14cdc86d1676 100644 --- a/drivers/staging/wlan-ng/p80211mgmt.h +++ b/drivers/staging/wlan-ng/p80211mgmt.h @@ -100,16 +100,10 @@ #ifndef _P80211MGMT_H #define _P80211MGMT_H -/*================================================================*/ -/* Project Includes */ - #ifndef _P80211HDR_H #include "p80211hdr.h" #endif -/*================================================================*/ -/* Constants */ - /*-- Information Element IDs --------------------*/ #define WLAN_EID_SSID 0 #define WLAN_EID_SUPP_RATES 1 |