diff options
| -rw-r--r-- | mk/modules.mk | 5 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 26 |
2 files changed, 1 insertions, 30 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index a9f61e659..52678042c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1190,11 +1190,6 @@ $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ ,42)) -$(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\ - $(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \ - $(MODULES_DIR)/kernel/sound/core/oss/snd-pcm-oss \ -,45)) - $(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\ $(MODULES_DIR)/kernel/sound/ac97_bus \ $(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \ diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d282ca91e..d3a15d602 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -22,15 +22,6 @@ config ADK_KERNEL_SND_PCM config ADK_KERNEL_SND_HWDEP boolean -config ADK_KERNEL_SND_OSSEMUL - boolean - -config ADK_KERNEL_SND_MIXER_OSS - boolean - -config ADK_KERNEL_SND_PCM_OSS - boolean - config ADK_KPACKAGE_KMOD_SOUND tristate @@ -47,27 +38,12 @@ config ADK_KPACKAGE_KMOD_SND_COMPRESS tristate config ADK_KPACKAGE_KMOD_SND - prompt "kmod-snd...................... ALSA sound support" tristate select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_OSSEMUL select ADK_KERNEL_SND_TIMER select ADK_KERNEL_SND_PCM select ADK_KERNEL_SND_HWDEP default n - help - Basic ALSA sound support. - -config ADK_KPACKAGE_KMOD_SND_OSSEMUL - prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" - tristate - select ADK_KERNEL_SND_MIXER_OSS - select ADK_KERNEL_SND_PCM_OSS - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 - default n - help - ALSA OSS Emulation config ADK_KPACKAGE_KMOD_SND_INTEL8X0 prompt "kmod-snd-intel8x0............. Intel AC97 driver" @@ -142,7 +118,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 default n config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S - prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI" + prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI" select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM select ADK_KPACKAGE_KMOD_SND_SOC |