git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 43e79c0)
staging: vt6655: 80211mgr.h add ieee80211.h header and fix conflicts
authorMalcolm Priestley <tvboxspy@gmail.com>
Fri, 22 Aug 2014 21:35:09 +0000 (22:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 30 Aug 2014 20:50:09 +0000 (13:50 -0700)
Fix conflict with WLAN_EID macros, by removing them.

This allows the adding other definitions from the ieee80211 header.

Eventually the 80211mgr.h header will be removed.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/80211mgr.h patch | blob | history

diff --cc drivers/staging/vt6655/80211mgr.h
Simple merge
Pandora Kernel Repository