diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-10 18:01:41 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-10 18:01:41 +1000 |
commit | 6a28d430b0f28ddf438fcd178edbba3a91d721a6 (patch) | |
tree | 8d565ed7d9c3695bd9bc7db51a1147fad8aec174 /drivers/staging/wlan-ng/p80211msg.h | |
parent | eca6c6d70d5dd0db05ebf2a5c2e18b806079c7ce (diff) | |
parent | 149d6c9154243d621dee02015ffc0e4dd263d906 (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/at76_usb/at76_usb.c
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/wlan-ng/p80211msg.h')
-rw-r--r-- | drivers/staging/wlan-ng/p80211msg.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h index 4ac77274eefd..c691d3eeb9d0 100644 --- a/drivers/staging/wlan-ng/p80211msg.h +++ b/drivers/staging/wlan-ng/p80211msg.h @@ -48,14 +48,8 @@ #ifndef _P80211MSG_H #define _P80211MSG_H -/*================================================================*/ -/* Project Includes */ - #define WLAN_DEVNAMELEN_MAX 16 -/*--------------------------------------------------------------------*/ -/* Prototype msg type */ - typedef struct p80211msg { u32 msgcode; u32 msglen; |