diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /sound/core/Kconfig | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'sound/core/Kconfig')
| -rw-r--r-- | sound/core/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index c15682a2f9db..475455c76610 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
| @@ -5,6 +5,7 @@ config SND_TIMER | |||
| 5 | config SND_PCM | 5 | config SND_PCM |
| 6 | tristate | 6 | tristate |
| 7 | select SND_TIMER | 7 | select SND_TIMER |
| 8 | select GCD | ||
| 8 | 9 | ||
| 9 | config SND_HWDEP | 10 | config SND_HWDEP |
| 10 | tristate | 11 | tristate |