Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[sfrench/cifs-2.6.git] / include / sound / ak4114.h

diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index c149d3b2558b35bfa957ed7c42992471ca8da87a..d293d36a66b86760fae36591ac0c9dbf032720ba 100644 (file)
--- a/include/sound/ak4114.h
+++ b/include/sound/ak4114.h
@@ -3,7 +3,7 @@
 
 /*
  *  Routines for Asahi Kasei AK4114
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -73,7 +73,7 @@
 
 /* AK4114_REQ_FORMAT bits */
 #define AK4114_MONO            (1<<7)  /* Double Sampling Frequency Mode: 0 = stereo, 1 = mono */
-#define AK4114_DIF2            (1<<5)  /* Audio Data Control */
+#define AK4114_DIF2            (1<<6)  /* Audio Data Control */
 #define AK4114_DIF1            (1<<5)  /* Audio Data Control */
 #define AK4114_DIF0            (1<<4)  /* Audio Data Control */
 #define AK4114_DIF_16R         (0)                             /* STDO: 16-bit, right justified */
@@ -158,7 +158,7 @@
 #define AK4114_CHECK_NO_STAT   (1<<0)  /* no statistics */
 #define AK4114_CHECK_NO_RATE   (1<<1)  /* no rate check */
 
-#define AK4114_CONTROLS                14
+#define AK4114_CONTROLS                15
 
 typedef void (ak4114_write_t)(void *private_data, unsigned char addr, unsigned char data);
 typedef unsigned char (ak4114_read_t)(void *private_data, unsigned char addr);
@@ -182,6 +182,7 @@ struct ak4114 {
        unsigned char rcs0;
        unsigned char rcs1;
        struct delayed_work work;
+       unsigned int check_flags;
        void *change_callback_private;
        void (*change_callback)(struct ak4114 *ak4114, unsigned char c0, unsigned char c1);
 };