diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-10 01:07:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-10 01:07:48 +0100 |
| commit | a36ae95c4e220afb976dd9d0d813d01e882b7b59 (patch) | |
| tree | 5a128e3f6a5a0d29c9dfd81a116381452951318f /sound/soc/codecs/sta32x.h | |
| parent | USB: ohci-s3c2410: add PM support (diff) | |
| parent | Linux 3.2-rc4 (diff) | |
| download | linux-a36ae95c4e220afb976dd9d0d813d01e882b7b59.tar.xz linux-a36ae95c4e220afb976dd9d0d813d01e882b7b59.zip | |
Merge v3.2-rc4 into usb-next
This lets us handle the PS3 merge easier, as well as syncing up with
other USB fixes already in the -rc4 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound/soc/codecs/sta32x.h')
| -rw-r--r-- | sound/soc/codecs/sta32x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/sta32x.h b/sound/soc/codecs/sta32x.h index b97ee5a75667..d8e32a6262ee 100644 --- a/sound/soc/codecs/sta32x.h +++ b/sound/soc/codecs/sta32x.h @@ -19,6 +19,7 @@ /* STA326 register addresses */ #define STA32X_REGISTER_COUNT 0x2d +#define STA32X_COEF_COUNT 62 #define STA32X_CONFA 0x00 #define STA32X_CONFB 0x01 |