Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / sound / pci / oxygen / oxygen_regs.h

diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h
index 72de159d45673b123df400486962078e3f401650..4dcd41b782586b7d7d9251a4c75aef37c36a4169 100644 (file)
--- a/sound/pci/oxygen/oxygen_regs.h
+++ b/sound/pci/oxygen/oxygen_regs.h
@@ -436,13 +436,15 @@
 /* OXYGEN_CHANNEL_* */
 
 #define OXYGEN_CODEC_VERSION           0xe4
-#define  OXYGEN_XCID_MASK              0x07
+#define  OXYGEN_CODEC_ID_MASK          0x07
 
 #define OXYGEN_REVISION                        0xe6
-#define  OXYGEN_REVISION_XPKGID_MASK   0x0007
+#define  OXYGEN_PACKAGE_ID_MASK                0x0007
+#define  OXYGEN_PACKAGE_ID_8786                0x0004
+#define  OXYGEN_PACKAGE_ID_8787                0x0006
+#define  OXYGEN_PACKAGE_ID_8788                0x0007
 #define  OXYGEN_REVISION_MASK          0xfff8
-#define  OXYGEN_REVISION_2             0x0008  /* bit flag */
-#define  OXYGEN_REVISION_8787          0x0014  /* 8 bits */
+#define  OXYGEN_REVISION_2             0x0008
 
 #define OXYGEN_OFFSIN_48K              0xe8
 #define OXYGEN_OFFSBASE_48K            0xe9