diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /sound/pci/rme96.c | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'sound/pci/rme96.c')
-rw-r--r-- | sound/pci/rme96.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index d5f5b440fc40..9ff247fc8871 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -150,7 +150,7 @@ MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard."); | |||
150 | #define RME96_RCR_BITPOS_F1 28 | 150 | #define RME96_RCR_BITPOS_F1 28 |
151 | #define RME96_RCR_BITPOS_F2 29 | 151 | #define RME96_RCR_BITPOS_F2 29 |
152 | 152 | ||
153 | /* Additonal register bits */ | 153 | /* Additional register bits */ |
154 | #define RME96_AR_WSEL (1 << 0) | 154 | #define RME96_AR_WSEL (1 << 0) |
155 | #define RME96_AR_ANALOG (1 << 1) | 155 | #define RME96_AR_ANALOG (1 << 1) |
156 | #define RME96_AR_FREQPAD_0 (1 << 2) | 156 | #define RME96_AR_FREQPAD_0 (1 << 2) |