diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-24 22:24:34 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-06-30 17:41:45 +0200 |
| commit | 25fa8919b124f8d7585327988b2a0a4a325e87d6 (patch) | |
| tree | fad5ab3a0744958fa1cb3381f139981c90d766f1 /patches/0060-trace_field_struct/mt7601u.patch | |
| parent | 1cc5efe8e280d78b5552bfee88bdac257151d888 (diff) | |
patches: Make patches apply on top of kernel 5.2-rc6
The cordic.c file was moved and the driver from drivers/staging/rtlwifi/
was removed in mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0060-trace_field_struct/mt7601u.patch')
| -rw-r--r-- | patches/0060-trace_field_struct/mt7601u.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0060-trace_field_struct/mt7601u.patch b/patches/0060-trace_field_struct/mt7601u.patch index 8b4af1f3..ca9dea53 100644 --- a/patches/0060-trace_field_struct/mt7601u.patch +++ b/patches/0060-trace_field_struct/mt7601u.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/mediatek/mt7601u/trace.h b/drivers/net/wireles index 2898973..7fa1b96 100644 --- a/drivers/net/wireless/mediatek/mt7601u/trace.h +++ b/drivers/net/wireless/mediatek/mt7601u/trace.h -@@ -252,6 +252,7 @@ TRACE_EVENT(freq_cal_offset, +@@ -244,6 +244,7 @@ TRACE_EVENT(freq_cal_offset, DEV_PR_ARG, __entry->phy_mode, __entry->freq_off) ); @@ -10,7 +10,7 @@ index 2898973..7fa1b96 100644 TRACE_EVENT(mt_rx, TP_PROTO(struct mt7601u_dev *dev, struct mt7601u_rxwi *rxwi, u32 f), TP_ARGS(dev, rxwi, f), -@@ -306,6 +307,20 @@ TRACE_EVENT(mt_tx, +@@ -298,6 +299,20 @@ TRACE_EVENT(mt_tx, __entry->h.ack_ctl, __entry->h.wcid, le16_to_cpu(__entry->h.len_ctl)) ); |