summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-23 10:55:50 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-23 10:55:50 +0200
commit9787008a8d921bd10dbabbf9d39fd665b22bb577 (patch)
tree8d4ee624eefafe61ac0fb1ad6c1170c458c0696f
parent026b0e49879529dcaf198efcf49ccec280fedfa0 (diff)
parenta14ea55bfeefd99c1d35656f08e1b9bc7daf1704 (diff)
downloadkernel-9787008a8d921bd10dbabbf9d39fd665b22bb577.tar.gz
kernel-9787008a8d921bd10dbabbf9d39fd665b22bb577.tar.xz
kernel-9787008a8d921bd10dbabbf9d39fd665b22bb577.zip
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
-rw-r--r--filter-aarch64.sh2
-rw-r--r--filter-aarch64.sh.fedora2
-rw-r--r--filter-armv7hl.sh2
-rw-r--r--filter-armv7hl.sh.fedora2
4 files changed, 4 insertions, 4 deletions
diff --git a/filter-aarch64.sh b/filter-aarch64.sh
index 41dc7d19c..7c3441b9d 100644
--- a/filter-aarch64.sh
+++ b/filter-aarch64.sh
@@ -9,7 +9,7 @@
# modifications to the overrides below. If something should be removed across
# all arches, remove it in the default instead of per-arch.
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio uwb w1"
ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora
index 41dc7d19c..7c3441b9d 100644
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@@ -9,7 +9,7 @@
# modifications to the overrides below. If something should be removed across
# all arches, remove it in the default instead of per-arch.
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio uwb w1"
ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh
index 69183432b..566083c1d 100644
--- a/filter-armv7hl.sh
+++ b/filter-armv7hl.sh
@@ -9,7 +9,7 @@
# modifications to the overrides below. If something should be removed across
# all arches, remove it in the default instead of per-arch.
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb soundwire staging tty uio uwb w1"
ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom"
diff --git a/filter-armv7hl.sh.fedora b/filter-armv7hl.sh.fedora
index 69183432b..566083c1d 100644
--- a/filter-armv7hl.sh.fedora
+++ b/filter-armv7hl.sh.fedora
@@ -9,7 +9,7 @@
# modifications to the overrides below. If something should be removed across
# all arches, remove it in the default instead of per-arch.
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb soundwire staging tty uio uwb w1"
ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom"