[Acx100-devel] [PATCH 01/19] merge.c: fix ifdef CONFIG_PCI

[Jim C. <jim...@gm...>]

Commit 5b98c8e5723, missed one ifdef conversion to CONFIG_ACX_MAC80211_PCI

Signed-off-by: Jim Cromie <jim...@gm...>
---
 merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge.c b/merge.c
index e952dae..fb02c28 100644
--- a/merge.c
+++ b/merge.c
@@ -1932,7 +1932,7 @@ int acx_reset_dev(acx_device_t *adev)
 	/* reset the device to make sure the eCPU is stopped
 	 * to upload the firmware correctly */
 
-#ifdef CONFIG_PCI
+#ifdef CONFIG_ACX_MAC80211_PCI
         acxpci_reset_mac(adev);
 #endif
 
-- 
1.7.10.1.487.ga3935e6