Merge branches 'release' and 'fluff' into release

[linux-2.6] / include / sound / ak4114.h

diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index 54a5a425302a9af7f682a8a93acfc868d091cb87..4e80d3fe738130c7cefad9673c771a756df2de8b 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
@@ -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);