diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:31:58 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:31:58 +0200 |
| commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
| tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /sound | |
| parent | Merge branch 'ptebits' into devel (diff) | |
| parent | [ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c (diff) | |
| download | linux-9e165acf1b9e37af7c0fa39399b43d0bd8600039.tar.xz linux-9e165acf1b9e37af7c0fa39399b43d0bd8600039.zip | |
Merge branch 'at91' into devel
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index a37bee094eba..8ebf512ced6c 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -91,6 +91,9 @@ endif # SOUND_PRIME endif # !M68K +endif # SOUND + +# AC97_BUS is used from both sound and ucb1400 config AC97_BUS tristate help @@ -99,4 +102,3 @@ config AC97_BUS sound although they're sharing the AC97 bus. Concerned drivers should "select" this. -endif # SOUND |