GNU Linux-libre 5.15.112-gnu

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@19277 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-5.15 b/deblob-5.15
index 4d406ed7ecb3a1a34c5c41b53c8d28e05442b470..b630c57ea70b416dfd122afb5cf4902ff697e97e 100755 (executable)
--- a/deblob-5.15
+++ b/deblob-5.15
@@ -3825,14 +3825,26 @@ clean_kconfig drivers/i2c/Kconfig I2C_SLAVE_EEPROM
 clean_mk CONFIG_I2C_SLAVE_EEPROM drivers/i2c/Makefile
 
 announce MHI_BUS - "Modem Host Interface (MHI) bus"
-reject_firmware drivers/bus/mhi/core/boot.c
-clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS
-clean_mk CONFIG_MHI_BUS drivers/bus/mhi/core/Makefile
+if test -f drivers/bus/mhi/host/boot.c; then
+  reject_firmware drivers/bus/mhi/host/boot.c
+  clean_kconfig drivers/bus/mhi/host/Kconfig MHI_BUS
+  clean_mk CONFIG_MHI_BUS drivers/bus/mhi/host/Makefile
+else
+  reject_firmware drivers/bus/mhi/core/boot.c
+  clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS
+  clean_mk CONFIG_MHI_BUS drivers/bus/mhi/core/Makefile
+fi
 
 announce MHI_BUS_PCI_GENERIC - "MHI PCI controller driver"
-clean_blob drivers/bus/mhi/pci_generic.c
-clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS_PCI_GENERIC
-clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/Makefile
+if test -f drivers/bus/mhi/host/pci_generic.c; then
+  clean_blob drivers/bus/mhi/host/pci_generic.c
+  clean_kconfig drivers/bus/mhi/host/Kconfig MHI_BUS_PCI_GENERIC
+  clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/host/Makefile
+else
+  clean_blob drivers/bus/mhi/pci_generic.c
+  clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS_PCI_GENERIC
+  clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/Makefile
+fi
 
 # Greybus