Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e3428e2cf83ca47b66c194559b9e8a74af915947

Authored by Al Viro
Committed by Linus Torvalds
1 parent 46cb69ccdf
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

msnd_* is ISA-only 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -79,7 +79,7 @@
79 79  
80 80 config SOUND_MSNDCLAS
81 81 tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
82   - depends on SOUND_PRIME && (m || !STANDALONE)
  82 + depends on SOUND_PRIME && (m || !STANDALONE) && ISA
83 83 help
84 84 Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
85 85 Monterey (not for the Pinnacle or Fiji).
... ... @@ -143,7 +143,7 @@
143 143  
144 144 config SOUND_MSNDPIN
145 145 tristate "Support for Turtle Beach MultiSound Pinnacle, Fiji"
146   - depends on SOUND_PRIME && (m || !STANDALONE)
  146 + depends on SOUND_PRIME && (m || !STANDALONE) && ISA
147 147 help
148 148 Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji.
149 149 See <file:Documentation/sound/oss/MultiSound> for important information