From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Fri, 22 Aug 2014 21:35:09 +0000 (+0100)
Subject: staging: vt6655: 80211mgr.h add ieee80211.h header and fix conflicts
X-Git-Tag: fixes-for-v3.18-merge-window~15^2~958
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20b33b194459867d6df6c87f654c070227b4eb7b;p=pandora-kernel.git

staging: vt6655: 80211mgr.h add ieee80211.h header and fix conflicts

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>
---

Reading git-diff-tree failed