vserver 1.9.5.x5

[linux-2.6.git] / sound / oss / ad1889.h

diff --git a/sound/oss/ad1889.h b/sound/oss/ad1889.h
index 5d13ef1..e04affc 100644 (file)
--- a/sound/oss/ad1889.h
+++ b/sound/oss/ad1889.h
@@ -34,9 +34,9 @@
 #define AD_DMAWAVICC   0x98    /* WAV interrupt current count */
 #define AD_DMAWAVIBC   0x9c    /* WAV interrupt base count */
 #define AD_DMARESCTRL  0xa0    /* RES PCI control/status */
-#define AD_DMAADCCTRL  0xa8    /* RES PCI control/status */
-#define AD_DMASYNCTRL  0xb0    /* RES PCI control/status */
-#define AD_DMAWAVCTRL  0xb8    /* RES PCI control/status */
+#define AD_DMAADCCTRL  0xa8    /* ADC PCI control/status */
+#define AD_DMASYNCTRL  0xb0    /* SYN PCI control/status */
+#define AD_DMAWAVCTRL  0xb8    /* WAV PCI control/status */
 #define AD_DMADISR     0xc0    /* PCI DMA intr status */
 #define AD_DMACHSS     0xc4    /* PCI DMA channel stop status */
 
@@ -104,7 +104,7 @@ typedef struct ad1889_state {
 } ad1889_state_t;
 
 typedef struct ad1889_dev {
-       unsigned long regbase;
+       void __iomem *regbase;
        struct pci_dev *pci;
        
        spinlock_t lock;