diff options
| -rw-r--r-- | mk/modules.mk | 4 | ||||
| -rw-r--r-- | target/arm/kernel/raspberry-pi | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.audio | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index ef4870dd1..d959d7453 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1163,10 +1163,6 @@ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) -$(eval $(call KMOD_template,SND_HRTIMER,snd-hrtimer,\ - $(MODULES_DIR)/kernel/sound/core/snd-hrtimer \ -,41)) - $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi index debb98417..2a1450ca3 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_FIQ=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_KUSER_HELPERS=y -CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y CONFIG_ARCH_BCM2708=y @@ -10,7 +10,6 @@ CONFIG_MACH_BCM2708=y CONFIG_BCM2708_GPIO=y CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_DMAER=y -CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_VFP=y CONFIG_DTC=y diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 8c4d7d751..dc2ff100f 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -31,9 +31,6 @@ config ADK_KERNEL_SND_MIXER_OSS config ADK_KERNEL_SND_PCM_OSS boolean -config ADK_KERNEL_SND_HRTIMER - boolean - config ADK_KPACKAGE_KMOD_SOUND tristate @@ -132,7 +129,6 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 tristate select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM - select ADK_KERNEL_SND_HRTIMER depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n |