[PATCH] myri10ge - Drop ununsed nvidia chipset id

[linux-2.6-omap-h63xx.git] / drivers / net / sungem.h

diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index 13006d759ad858f79737d787aa3010f005b733e0..89847215d0066bfb75881b21a61362b4483812b3 100644 (file)
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -980,15 +980,15 @@ struct gem {
        int                     tx_new, tx_old;
 
        unsigned int has_wol : 1;       /* chip supports wake-on-lan */
-       unsigned int asleep : 1;        /* chip asleep, protected by pm_sem */
+       unsigned int asleep : 1;        /* chip asleep, protected by pm_mutex */
        unsigned int asleep_wol : 1;    /* was asleep with WOL enabled */
-       unsigned int opened : 1;        /* driver opened, protected by pm_sem */
+       unsigned int opened : 1;        /* driver opened, protected by pm_mutex */
        unsigned int running : 1;       /* chip running, protected by lock */
        
        /* cell enable count, protected by lock */
        int                     cell_enabled;  
        
-       struct semaphore        pm_sem;
+       struct mutex            pm_mutex;
 
        u32                     msg_enable;
        u32                     status;