mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-21 23:01:04 +07:00
e91455a149
Tha ARM randconfig builds came up with another rare build failure
for the dib3000mc driver, when dvb-usb-dibusb-mb is built-in and
dib3000mc is a loadable module:
ERROR: "dibusb_dib3000mc_frontend_attach" [drivers/media/usb/dvb-usb/dvb-usb-nova-t-usb2.ko] undefined!
ERROR: "dibusb_dib3000mc_tuner_attach" [drivers/media/usb/dvb-usb/dvb-usb-nova-t-usb2.ko] undefined!
Apparently this used to be a valid configuration (build-time, not
run-time), but broke as part of a cleanup.
I tried reverting the cleanup, but saw that the code was still wrong
then. This tries to fix the code properly, by moving the problematic
functions into a new file that now is built as a loadable module or
built-in, whichever is correct for a particular configuration. It fixes
the regression as well as the runtime problem that already existed.
The new module dependency chain is now:
dvb-usb-{dibusb_mc,a800,dib0700,umt-010,gp8psk} dvb-usb-dibusb-mb
| | | |
dvb-usb-dibusb-mc-common | ___________| |
| | | | |
dib3000mc (frontend) | | | dib3000mb (frontend)
| | |
| | |
dvb-usb-dibusb-common
I have also checked the two other files that were changed in the original
cleanup, and found them to be correct in either version, so I do not
touch that part.
As this is a rather obscure bug, there is no need for backports.
Fixes: 028c70ff42 ("[media] dvb-usb/dvb-usb-v2: use IS_ENABLED")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
87 lines
2.7 KiB
Makefile
87 lines
2.7 KiB
Makefile
dvb-usb-objs += dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o
|
|
dvb-usb-objs += dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o
|
|
obj-$(CONFIG_DVB_USB) += dvb-usb.o
|
|
|
|
dvb-usb-vp7045-objs := vp7045.o vp7045-fe.o
|
|
obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o
|
|
|
|
dvb-usb-vp702x-objs := vp702x.o vp702x-fe.o
|
|
obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o
|
|
|
|
dvb-usb-gp8psk-objs := gp8psk.o gp8psk-fe.o
|
|
obj-$(CONFIG_DVB_USB_GP8PSK) += dvb-usb-gp8psk.o
|
|
|
|
dvb-usb-dtt200u-objs := dtt200u.o dtt200u-fe.o
|
|
obj-$(CONFIG_DVB_USB_DTT200U) += dvb-usb-dtt200u.o
|
|
|
|
dvb-usb-dibusb-common-objs := dibusb-common.o
|
|
|
|
dvb-usb-dibusb-mc-common-objs := dibusb-mc-common.o
|
|
obj-$(CONFIG_DVB_USB_DIB3000MC) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mc-common.o
|
|
|
|
dvb-usb-a800-objs := a800.o
|
|
obj-$(CONFIG_DVB_USB_A800) += dvb-usb-a800.o
|
|
|
|
dvb-usb-dibusb-mb-objs := dibusb-mb.o
|
|
obj-$(CONFIG_DVB_USB_DIBUSB_MB) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mb.o
|
|
|
|
dvb-usb-dibusb-mc-objs := dibusb-mc.o
|
|
obj-$(CONFIG_DVB_USB_DIBUSB_MC) += dvb-usb-dibusb-mc.o
|
|
|
|
dvb-usb-nova-t-usb2-objs := nova-t-usb2.o
|
|
obj-$(CONFIG_DVB_USB_NOVA_T_USB2) += dvb-usb-nova-t-usb2.o
|
|
|
|
dvb-usb-umt-010-objs := umt-010.o
|
|
obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-umt-010.o
|
|
|
|
dvb-usb-m920x-objs := m920x.o
|
|
obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m920x.o
|
|
|
|
dvb-usb-digitv-objs := digitv.o
|
|
obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
|
|
|
|
dvb-usb-cxusb-objs := cxusb.o
|
|
obj-$(CONFIG_DVB_USB_CXUSB) += dvb-usb-cxusb.o
|
|
|
|
dvb-usb-ttusb2-objs := ttusb2.o
|
|
obj-$(CONFIG_DVB_USB_TTUSB2) += dvb-usb-ttusb2.o
|
|
|
|
dvb-usb-dib0700-objs := dib0700_core.o dib0700_devices.o
|
|
obj-$(CONFIG_DVB_USB_DIB0700) += dvb-usb-dib0700.o
|
|
|
|
dvb-usb-opera-objs := opera1.o
|
|
obj-$(CONFIG_DVB_USB_OPERA1) += dvb-usb-opera.o
|
|
|
|
dvb-usb-af9005-objs := af9005.o af9005-fe.o
|
|
obj-$(CONFIG_DVB_USB_AF9005) += dvb-usb-af9005.o
|
|
|
|
dvb-usb-af9005-remote-objs := af9005-remote.o
|
|
obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o
|
|
|
|
dvb-usb-pctv452e-objs := pctv452e.o
|
|
obj-$(CONFIG_DVB_USB_PCTV452E) += dvb-usb-pctv452e.o
|
|
|
|
dvb-usb-dw2102-objs := dw2102.o
|
|
obj-$(CONFIG_DVB_USB_DW2102) += dvb-usb-dw2102.o
|
|
|
|
dvb-usb-dtv5100-objs := dtv5100.o
|
|
obj-$(CONFIG_DVB_USB_DTV5100) += dvb-usb-dtv5100.o
|
|
|
|
dvb-usb-cinergyT2-objs := cinergyT2-core.o cinergyT2-fe.o
|
|
obj-$(CONFIG_DVB_USB_CINERGY_T2) += dvb-usb-cinergyT2.o
|
|
|
|
dvb-usb-friio-objs := friio.o friio-fe.o
|
|
obj-$(CONFIG_DVB_USB_FRIIO) += dvb-usb-friio.o
|
|
|
|
dvb-usb-az6027-objs := az6027.o
|
|
obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o
|
|
|
|
dvb-usb-technisat-usb2-objs := technisat-usb2.o
|
|
obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o
|
|
|
|
ccflags-y += -I$(srctree)/drivers/media/dvb-core
|
|
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends/
|
|
# due to tuner-xc3028
|
|
ccflags-y += -I$(srctree)/drivers/media/tuners
|
|
ccflags-y += -I$(srctree)/drivers/media/pci/ttpci
|