Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[~andy/linux] / drivers / atm / ambassador.h

diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h
index 84a93063cfe1a9e54cf3a9665faa1600fe9d92e0..df55fa8387dc4d374d567ef33dd6d66643d29305 100644 (file)
--- a/drivers/atm/ambassador.h
+++ b/drivers/atm/ambassador.h
@@ -23,7 +23,6 @@
 #ifndef AMBASSADOR_H
 #define AMBASSADOR_H
 
-#include <linux/config.h>
 
 #ifdef CONFIG_ATM_AMBASSADOR_DEBUG
 #define DEBUG_AMBASSADOR
@@ -627,7 +626,7 @@ typedef struct {
 
 struct amb_dev {
   u8               irq;
-  long            flags;
+  unsigned long           flags;
   u32              iobase;
   u32 *            membase;
 
@@ -639,7 +638,7 @@ struct amb_dev {
   amb_txq          txq;
   amb_rxq          rxq[NUM_RX_POOLS];
   
-  struct semaphore vcc_sf;
+  struct mutex     vcc_sf;
   amb_tx_info      txer[NUM_VCS];
   struct atm_vcc * rxer[NUM_VCS];
   unsigned int     tx_avail;