Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / drivers / atm / ambassador.h

diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h
index 8296420ceaef3a59a422d240efb3e424f9fba8c1..ff2a303cbe000325c71079d2846ffc98ed26fdba 100644 (file)
--- a/drivers/atm/ambassador.h
+++ b/drivers/atm/ambassador.h
@@ -626,7 +626,7 @@ typedef struct {
 
 struct amb_dev {
   u8               irq;
-  long            flags;
+  unsigned long           flags;
   u32              iobase;
   u32 *            membase;