AOSP: Merge mismatch

This seems like undesired merge mismatch from this AOSP commit and
should be reverted:

commit a54fa5fb807eaeff45464139b5a7759f060cec68
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Jan 15 13:53:35 2013 -0800

    Accumulative patch from commit dc013f1e37df3462085cf01a13f0c432f146ad7a

    Author: Jouni Malinen <jouni@qca.qualcomm.com>
    Date:   Tue Jan 15 12:03:29 2013 +0200
        eapol_test: Remove unnecessary header file inclusion

     - P2P: Send P2P-FIND-STOPPED event in the new continue-search states
     - P2P: Add some more details on Service Query TLV format
     - P2P: Use the same Dialog Token value for every GO Negotiation retry
     - P2P: Publish more connected clients info in Probe Response frames
     - P2P: Fix some memory leaks in p2p_add_device()
     - P2P: Use the same Dialog Token value for every PD retry
     - P2P: Document operating channel selection functions
     - P2P: Always re-select operating channel if not hard coded
     - P2P: Do not allow re-selection of GO channel if forced_freq in use
     - P2P: Set FORCE_FREQ flag as part of p2p_prepare_channel()
     - P2P: Share a single function for GO channel selection
     - P2P: Prefer operating channels where HT40 is possible
     - P2P: Be more careful with wpa_config_update_psk() call
     - P2P: Allow PSK to be used instead of passphrase for persistent GO
     - P2P: Consider age for the P2P scan results
     - Move some P2P offchannel operations to offchannel.c
     - P2P: Add more complete description of p2p_cancel
     - P2P: Allow p2p_cancel to be used to stop p2p_connect-join operation
     - Interworking changes
     - WNM changes
     - WPS changes
     - SAE changes

    Change-Id: I38b847d3460066cc58aecbcf67266bfcff1d344e
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 6edc52e0a84a72873c1f928bab08bba4f4a84763..0fe6662856a0a8df67172a954839896b96d16d37 100644 (file)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -761,12 +761,12 @@ OBJS += src/ap/eap_user_db.c
 ifdef CONFIG_IEEE80211N
 OBJS += src/ap/ieee802_11_ht.c
 endif
-ifdef CONFIG_CTRL_IFACE
-OBJS += src/ap/ctrl_iface_ap.c
-endif
 ifdef CONFIG_WNM
 OBJS += src/ap/wnm_ap.c
 endif
+ifdef CONFIG_CTRL_IFACE
+OBJS += src/ap/ctrl_iface_ap.c
+endif
 
 L_CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY
 OBJS += src/eap_server/eap_server.c