backports: remove unnecessary patches
authorJohannes Berg <johannes.berg@intel.com>
Mon, 15 Apr 2013 21:29:06 +0000 (23:29 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 15 Apr 2013 21:29:27 +0000 (23:29 +0200)
The files these patch already include the headers
that are patched in, so the patches are entirely
unnecessary.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
patches/collateral-evolutions/network/06-header-changes/net_mac80211_key.patch [deleted file]
patches/collateral-evolutions/network/06-header-changes/net_mac80211_pm.patch [deleted file]

diff --git a/patches/collateral-evolutions/network/06-header-changes/net_mac80211_key.patch b/patches/collateral-evolutions/network/06-header-changes/net_mac80211_key.patch
deleted file mode 100644 (file)
index 7f8bbeb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/net/mac80211/key.c
-+++ b/net/mac80211/key.c
-@@ -24,6 +24,9 @@
- #include "aes_ccm.h"
- #include "aes_cmac.h"
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+#include <asm/unaligned.h>
-+#endif
- /**
-  * DOC: Key handling basics
diff --git a/patches/collateral-evolutions/network/06-header-changes/net_mac80211_pm.patch b/patches/collateral-evolutions/network/06-header-changes/net_mac80211_pm.patch
deleted file mode 100644 (file)
index cd7ae0e..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/net/mac80211/pm.c
-+++ b/net/mac80211/pm.c
-@@ -1,5 +1,6 @@
- #include <net/mac80211.h>
- #include <net/rtnetlink.h>
-+#include <linux/export.h>
- #include "ieee80211_i.h"
- #include "mesh.h"