Merge branch 'for-2.6.26' into for-next

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

diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h
index 2982be3363ef415fa13ba2da0263d1d4b6fb6e2c..f91a88fc1e35b0023faf78daf85780fafb17f495 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_mgt.h
+++ b/drivers/net/wireless/prism54/islpci_mgt.h
@@ -1,5 +1,4 @@
 /*
- *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright (C) 2003 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
  *
@@ -36,8 +35,8 @@ extern int pc_debug;
 
 
 /* General driver definitions */
-#define PCIDEVICE_LATENCY_TIMER_MIN            0x40
-#define PCIDEVICE_LATENCY_TIMER_VAL            0x50
+#define PCIDEVICE_LATENCY_TIMER_MIN            0x40
+#define PCIDEVICE_LATENCY_TIMER_VAL            0x50
 
 /* Debugging verbose definitions */
 #define SHOW_NOTHING                            0x00   /* overrules everything */
@@ -87,7 +86,7 @@ extern int pc_debug;
 #define PIMFOR_FLAG_LITTLE_ENDIAN               0x02
 
 static inline void
-add_le32p(u32 * le_number, u32 add)
+add_le32p(__le32 * le_number, u32 add)
 {
        *le_number = cpu_to_le32(le32_to_cpup(le_number) + add);
 }