diff options
| author | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-08 16:33:52 -0500 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> | 2008-01-08 16:33:52 -0500 |
| commit | 25f2efd0475be0dbc68d65189eea88eeb85679d9 (patch) | |
| tree | dd2f3d7a6cc107395007b7f102be7f0b2ddfb0cb | |
| parent | f9547bb84b9cb0b51beaf7c0edac03ef19b96c84 (diff) | |
| download | compat-wireless-2.6-old-25f2efd0475be0dbc68d65189eea88eeb85679d9.tar.gz | |
Apply compat.diff cleanly
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
| -rw-r--r-- | compat/compat.diff | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/compat/compat.diff b/compat/compat.diff index d795bb7..347c97a 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -549,8 +549,18 @@ obj-$(CONFIG_LIBERTAS) += libertas/ rtl8180-objs := rtl8180_dev.o rtl8180_rtl8225.o rtl8180_sa2400.o rtl8180_max2820.o rtl8180_grf5101.o ---- a/net/mac80211/ieee80211.c 2008-01-08 14:50:01.000000000 -0500 -+++ b/net/mac80211/ieee80211.c 2008-01-08 14:50:02.000000000 -0500 +--- a/net/mac80211/Makefile 2008-01-08 15:41:04.000000000 -0500 ++++ b/net/mac80211/Makefile 2008-01-08 15:42:10.000000000 -0500 +@@ -27,6 +27,7 @@ + tx.o \ + key.o \ + util.o \ ++ compat.o \ + event.o + + mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o +--- a/net/mac80211/ieee80211.c 2008-01-08 16:32:22.000000000 -0500 ++++ b/net/mac80211/ieee80211.c 2008-01-08 16:32:22.000000000 -0500 @@ -21,7 +21,9 @@ #include <linux/wireless.h> #include <linux/rtnetlink.h> @@ -561,7 +571,7 @@ #include <net/cfg80211.h> #include "ieee80211_i.h" -@@ -1088,7 +1090,9 @@ +@@ -1093,7 +1095,9 @@ mdev->open = ieee80211_master_open; mdev->stop = ieee80211_master_stop; mdev->type = ARPHRD_IEEE80211; @@ -571,13 +581,3 @@ mdev->set_multicast_list = ieee80211_master_set_multicast_list; sdata->vif.type = IEEE80211_IF_TYPE_AP; ---- a/net/mac80211/Makefile 2008-01-08 15:41:04.000000000 -0500 -+++ b/net/mac80211/Makefile 2008-01-08 15:42:10.000000000 -0500 -@@ -27,6 +27,7 @@ - tx.o \ - key.o \ - util.o \ -+ compat.o \ - event.o - - mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o |