vserver 1.9.5.x5

[linux-2.6.git] / include / linux / cyclades.h

diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index cc59850..337156c 100644 (file)
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -511,8 +511,8 @@ struct resource;
 struct cyclades_card {
     unsigned long base_phys;
     unsigned long ctl_phys;
-    unsigned long base_addr;
-    unsigned long ctl_addr;
+    void __iomem *base_addr;
+    void __iomem *ctl_addr;
     int irq;
     int num_chips;     /* 0 if card absent, -1 if Z/PCI, else Y */
     int first_line;    /* minor number of first channel on card */
@@ -539,9 +539,9 @@ struct cyclades_chip {
  * (required to support Alpha systems) *
  ***************************************/
 
-#define cy_writeb(port,val)     {writeb((ucchar)(val),(ulong)(port)); mb();}
-#define cy_writew(port,val)     {writew((ushort)(val),(ulong)(port)); mb();}
-#define cy_writel(port,val)     {writel((uclong)(val),(ulong)(port)); mb();}
+#define cy_writeb(port,val)     {writeb((val),(port)); mb();}
+#define cy_writew(port,val)     {writew((val),(port)); mb();}
+#define cy_writel(port,val)     {writel((val),(port)); mb();}
 
 #define cy_readb(port)  readb(port)
 #define cy_readw(port)  readw(port)
@@ -624,7 +624,11 @@ struct cyclades_port {
 #define        Cy_EVENT_DELTA_WAKEUP           6
 #define        Cy_EVENT_Z_RX_FULL              7
 
+#if HZ < 2185
 #define        CLOSING_WAIT_DELAY      30*HZ
+#else
+#define        CLOSING_WAIT_DELAY      65534
+#endif
 #define CY_CLOSING_WAIT_NONE   65535
 #define CY_CLOSING_WAIT_INF    0