diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-04 17:14:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-04 17:14:56 +1000 |
| commit | 3a54db4e5c665332044e1e6199a645918c98f330 (patch) | |
| tree | 22900a954c50c02d4c5d0da594686cf90941c54b /drivers/staging/wlan-ng/p80211types.h | |
| parent | 15b0a180dee145b0094486c3c6e26fc3d248fa7f (diff) | |
| parent | 6d03c322d674032d8370363373472f9bae9c0214 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/wlan-ng/p80211types.h')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211types.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h index 043da1e5607f..2b83ab0c711b 100644 --- a/drivers/staging/wlan-ng/p80211types.h +++ b/drivers/staging/wlan-ng/p80211types.h @@ -57,10 +57,6 @@ #ifndef _P80211TYPES_H #define _P80211TYPES_H -/*================================================================*/ -/* Project Includes */ -/*================================================================*/ - /*----------------------------------------------------------------*/ /* The following constants are indexes into the Mib Category List */ /* and the Message Category List */ |