[ARM] Merge most of the PXA work for initial merge

[linux-2.6] / drivers / net / wireless / prism54 / islpci_dev.h

diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h
index b03a2ab0009b40db682aa2a406f187902835eb63..8e55a5fcffaedaa2e1d181ed6ec65cc62f3b639c 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.h
+++ b/drivers/net/wireless/prism54/islpci_dev.h
@@ -88,7 +88,7 @@ typedef struct {
 
        /* Take care of the wireless stats */
        struct work_struct stats_work;
-       struct semaphore stats_sem;
+       struct mutex stats_lock;
        /* remember when we last updated the stats */
        unsigned long stats_timestamp;
        /* The first is accessed under semaphore locking.
@@ -178,7 +178,7 @@ typedef struct {
        int wpa; /* WPA mode enabled */
        struct list_head bss_wpa_list;
        int num_bss_wpa;
-       struct semaphore wpa_sem;
+       struct mutex wpa_lock;
        u8 wpa_ie[MAX_WPA_IE_LEN];
        size_t wpa_ie_len;