diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-10-04 02:17:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 07:55:32 -0700 |
| commit | d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6 (patch) | |
| tree | a48388734053900a8379042757ee241d1e9dfc7b /sound/oss/tuning.h | |
| parent | 595182bcdf64fbfd7ae22c67ea6081b7d387d246 (diff) | |
| download | kernel_samsung_tuna-d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6.zip kernel_samsung_tuna-d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6.tar.gz kernel_samsung_tuna-d56b9b9c464a10ab1ee51a4c6190a2b57b8ef7a6.tar.bz2 | |
[PATCH] The scheduled removal of some OSS drivers
This patch contains the scheduled removal of OSS drivers that:
- have ALSA drivers for the same hardware without known regressions and
- whose Kconfig options have been removed in 2.6.17.
[michal.k.k.piotrowski@gmail.com: build fix]
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/tuning.h')
| -rw-r--r-- | sound/oss/tuning.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/oss/tuning.h b/sound/oss/tuning.h index 858e1fe..a73e3dd 100644 --- a/sound/oss/tuning.h +++ b/sound/oss/tuning.h @@ -1,13 +1,11 @@ -#ifdef SEQUENCER_C - -unsigned short semitone_tuning[24] = +static unsigned short semitone_tuning[24] = { /* 0 */ 10000, 10595, 11225, 11892, 12599, 13348, 14142, 14983, /* 8 */ 15874, 16818, 17818, 18877, 20000, 21189, 22449, 23784, /* 16 */ 25198, 26697, 28284, 29966, 31748, 33636, 35636, 37755 }; -unsigned short cent_tuning[100] = +static unsigned short cent_tuning[100] = { /* 0 */ 10000, 10006, 10012, 10017, 10023, 10029, 10035, 10041, /* 8 */ 10046, 10052, 10058, 10064, 10070, 10075, 10081, 10087, @@ -23,7 +21,3 @@ unsigned short cent_tuning[100] = /* 88 */ 10521, 10528, 10534, 10540, 10546, 10552, 10558, 10564, /* 96 */ 10570, 10576, 10582, 10589 }; -#else -extern unsigned short semitone_tuning[24]; -extern unsigned short cent_tuning[100]; -#endif |