commit | 7a7b37328864286d0079d03198260e5f92d0a512 | [log] [tgz] |
---|---|---|
author | Michal Kazior <michal.kazior@tieto.com> | Tue Aug 19 13:22:32 2014 +0200 |
committer | Kalle Valo <kvalo@qca.qualcomm.com> | Mon Aug 25 11:21:49 2014 +0300 |
tree | a48c8a1dafca4ff9119ee141f341afd67f858e91 | |
parent | 10d49878971852111b49f59f6f56c3641b691173 [diff] |
ath10k: fix a conflict bug in wmi service bitmap Service mapping for main firmware branch was incorrectly used for 10.x firmware and vice-versa. This caused wmi_services in debugfs to print wrong values. This fixes commit cff990ce7ddd6 ("ath10k: fix wmi service bitmap debug") where for some reason there was either a conflict that wasn't resolved properly or git had a bad day. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>