summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/05-usb
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-05 00:29:26 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-04-05 00:29:26 +0200
commit30498b130cc0476e73f5142dcc63bc271da2d89b (patch)
tree4719208b11adb08bf484867024642b2f8464d0b4 /patches/collateral-evolutions/network/05-usb
parenta7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872 (diff)
refresh patches against next-20130328
The patches were last refreshed against that same tree, so the only change is that now we have -p in there, which results in changes like this (only): -@@ -1593,7 +1593,7 @@ +@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_ This makes the patches more readable. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/05-usb')
-rw-r--r--patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch2
-rw-r--r--patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch b/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch
index 96077326..a681f60d 100644
--- a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch
+++ b/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_ath_ath9k_hif_usb.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -1370,7 +1370,9 @@
+@@ -1370,7 +1370,9 @@ static struct usb_driver ath9k_hif_usb_d
.reset_resume = ath9k_hif_usb_resume,
#endif
.id_table = ath9k_hif_usb_ids,
diff --git a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch b/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch
index 4662b020..7862af83 100644
--- a/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch
+++ b/patches/collateral-evolutions/network/05-usb/drivers_net_wireless_p54_p54usb.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
-@@ -1137,7 +1137,9 @@
+@@ -1137,7 +1137,9 @@ static struct usb_driver p54u_driver = {
.resume = p54u_resume,
.reset_resume = p54u_resume,
#endif /* CONFIG_PM */