298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: fixes usb-audio depends (#11713)

Browse Source 
Fixes: #11703
This commit is contained in:
HHJLKK 2023-12-17 12:25:25 +08:00 committed by GitHub
parent a316972306
commit 783f460c97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/kernel/linux/modules/usb.mk
View File

@ -549,6 +549,7 @@ define KernelPackage/usb-audio
CONFIG_SND_USB_AUDIO CONFIG_SND_USB_AUDIO
$(call AddDepends/usb) $(call AddDepends/usb)
$(call AddDepends/sound) $(call AddDepends/sound)
DEPENDS += +LINUX_6_1:kmod-media-core
FILES:= \ FILES:= \
$(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \ $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \
$(LINUX_DIR)/sound/usb/snd-usb-audio.ko $(LINUX_DIR)/sound/usb/snd-usb-audio.ko

24
package/kernel/linux/modules/video.mk
View File

@ -240,6 +240,23 @@ endef
$(eval $(call KernelPackage,fb-tft-ili9486)) $(eval $(call KernelPackage,fb-tft-ili9486))
define KernelPackage/media-core
SUBMENU:=$(VIDEO_MENU)
TITLE=Multimedia support
HIDDEN:=1
KCONFIG:= \
CONFIG_MEDIA_SUPPORT \
CONFIG_MEDIA_CAMERA_SUPPORT=y
FILES:=$(LINUX_DIR)/drivers/media/mc/mc.ko
AUTOLOAD:=$(call AutoProbe,mc)
endef
define KernelPackage/media-core/description
Kernel modules for media controller support
endef
$(eval $(call KernelPackage,media-core))
define KernelPackage/multimedia-input define KernelPackage/multimedia-input
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=Multimedia input support TITLE:=Multimedia input support
@ -541,13 +558,12 @@ $(eval $(call KernelPackage,drm-nouveau))
define KernelPackage/video-core define KernelPackage/video-core
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE=Video4Linux support TITLE=Video4Linux support
DEPENDS:=+PACKAGE_kmod-i2c-core:kmod-i2c-core DEPENDS:=+PACKAGE_kmod-i2c-core:kmod-i2c-core \
+LINUX_6_1:kmod-media-core
KCONFIG:= \ KCONFIG:= \
CONFIG_MEDIA_SUPPORT \
CONFIG_MEDIA_CAMERA_SUPPORT=y \
CONFIG_VIDEO_DEV \ CONFIG_VIDEO_DEV \
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
FILES:=$(LINUX_DIR)/drivers/media/mc/mc.ko@ge6.1 \ FILES:= \
$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko
AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common) AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common)
endef endef