From: Michal Kazior <michal.kazior@tieto.com>
Date: Tue, 19 Aug 2014 11:22:32 +0000 (+0200)
Subject: ath10k: fix a conflict bug in wmi service bitmap
X-Git-Tag: omap-for-v3.19/prcm-cleanup~78^2~133^2~55^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a7b37328864286d0079d03198260e5f92d0a512;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed