diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /sound/Kconfig | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'sound/Kconfig')
| -rw-r--r-- | sound/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index b3e53e616ec9..fcad760f5691 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # sound/Config.in | ||
| 2 | # | ||
| 3 | |||
| 4 | menuconfig SOUND | 1 | menuconfig SOUND |
| 5 | tristate "Sound card support" | 2 | tristate "Sound card support" |
| 6 | depends on HAS_IOMEM | 3 | depends on HAS_IOMEM |
| @@ -136,4 +133,3 @@ config AC97_BUS | |||
| 136 | sound subsystem and other function drivers completely unrelated to | 133 | sound subsystem and other function drivers completely unrelated to |
| 137 | sound although they're sharing the AC97 bus. Concerned drivers | 134 | sound although they're sharing the AC97 bus. Concerned drivers |
| 138 | should "select" this. | 135 | should "select" this. |
| 139 | |||