1 files changed, 1 insertions, 42 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 60af3a7d982..a0457a57094 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -36,6 +36,7 @@
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include "oxygen.h"
+#include "ak4396.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 driver");
@@ -61,8 +62,6 @@ static struct pci_device_id oxygen_ids[] __devinitdata = {
         { OXYGEN_PCI_SUBID(0x13f6, 0x0010) },
         { OXYGEN_PCI_SUBID(0x13f6, 0x8788) },
         { OXYGEN_PCI_SUBID(0x147a, 0xa017) },
-        { OXYGEN_PCI_SUBID(0x14c3, 0x1710) },
-        { OXYGEN_PCI_SUBID(0x14c3, 0x1711) },
         { OXYGEN_PCI_SUBID(0x1a58, 0x0910) },
         { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = 1 },
         { OXYGEN_PCI_SUBID(0x7284, 0x9761) },
@@ -76,46 +75,6 @@ MODULE_DEVICE_TABLE(pci, oxygen_ids);
 #define GPIO_AK5385_DFS_DOUBLE  0x0001
 #define GPIO_AK5385_DFS_QUAD    0x0002
 
-#define AK4396_WRITE    0x2000
-
-#define AK4396_CONTROL_1        0
-#define AK4396_CONTROL_2        1
-#define AK4396_CONTROL_3        2
-#define AK4396_LCH_ATT          3
-#define AK4396_RCH_ATT          4
-
-/* control 1 */
-#define AK4396_RSTN             0x01
-#define AK4396_DIF_MASK         0x0e
-#define AK4396_DIF_16_LSB       0x00
-#define AK4396_DIF_20_LSB       0x02
-#define AK4396_DIF_24_MSB       0x04
-#define AK4396_DIF_24_I2S       0x06
-#define AK4396_DIF_24_LSB       0x08
-#define AK4396_ACKS             0x80
-/* control 2 */
-#define AK4396_SMUTE            0x01
-#define AK4396_DEM_MASK         0x06
-#define AK4396_DEM_441          0x00
-#define AK4396_DEM_OFF          0x02
-#define AK4396_DEM_48           0x04
-#define AK4396_DEM_32           0x06
-#define AK4396_DFS_MASK         0x18
-#define AK4396_DFS_NORMAL       0x00
-#define AK4396_DFS_DOUBLE       0x08
-#define AK4396_DFS_QUAD         0x10
-#define AK4396_SLOW             0x20
-#define AK4396_DZFM             0x40
-#define AK4396_DZFE             0x80
-/* control 3 */
-#define AK4396_DZFB             0x04
-#define AK4396_DCKB             0x10
-#define AK4396_DCKS             0x20
-#define AK4396_DSDM             0x40
-#define AK4396_D_P_MASK         0x80
-#define AK4396_PCM              0x00
-#define AK4396_DSD              0x80
-
 #define WM8785_R0       0
 #define WM8785_R1       1
 #define WM8785_R2       2