Fix am cef482f8: merge

Change-Id: I47a4610b40092d81a4d62e53a26924c4f9d05a17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index 9fc3219..0863607 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -443,12 +443,6 @@
 	 * WPS or similar so that they may be exported.
 	 */
 	int export_keys;
-#ifdef ANDROID_P2P
-	/**
-	 * assoc_retry - Number of times association should be retried.
-	 */
-	int assoc_retry;
-#endif
 
 #ifdef ANDROID_P2P
 	/**