git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
media
/
radio
/
Kconfig
diff --git
a/drivers/media/radio/Kconfig
b/drivers/media/radio/Kconfig
index
e4c97fd
..
52798a1
100644
(file)
--- a/
drivers/media/radio/Kconfig
+++ b/
drivers/media/radio/Kconfig
@@
-168,7
+168,7
@@
config RADIO_MAXIRADIO
config RADIO_MIROPCM20
tristate "miroSOUND PCM20 radio"
config RADIO_MIROPCM20
tristate "miroSOUND PCM20 radio"
- depends on ISA && VIDEO_V4L2 && SND
+ depends on ISA &&
ISA_DMA_API &&
VIDEO_V4L2 && SND
select SND_ISA
select SND_MIRO
---help---
select SND_ISA
select SND_MIRO
---help---
@@
-201,7
+201,7
@@
config RADIO_SF16FMI
config RADIO_SF16FMR2
tristate "SF16FMR2 Radio"
config RADIO_SF16FMR2
tristate "SF16FMR2 Radio"
- depends on ISA && VIDEO_V4L2
+ depends on ISA && VIDEO_V4L2
&& SND
---help---
Choose Y here if you have one of these FM radio cards.
---help---
Choose Y here if you have one of these FM radio cards.