Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into for-linus

[firefly-linux-kernel-4.4.55.git] / sound / pci / ctxfi / ct20k2reg.h

diff --git a/sound/pci/ctxfi/ct20k2reg.h b/sound/pci/ctxfi/ct20k2reg.h
index 2d07986f57cc4316bfda42505aa496a25d199899..e0394e3996e851dda9b6abc6d22f52d81512a3b8 100644 (file)
--- a/sound/pci/ctxfi/ct20k2reg.h
+++ b/sound/pci/ctxfi/ct20k2reg.h
@@ -11,9 +11,12 @@
 
 
 /* Timer Registers */
-#define TIMER_TIMR          0x1B7004
-#define INTERRUPT_GIP       0x1B7010
-#define INTERRUPT_GIE       0x1B7014
+#define WC             0x1b7000
+#define TIMR           0x1b7004
+# define       TIMR_IE         (1<<15)
+# define       TIMR_IP         (1<<14)
+#define GIP            0x1b7010
+#define GIE            0x1b7014
 
 /* I2C Registers */
 #define I2C_IF_ADDRESS   0x1B9000