aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2021-07-13 22:40:39 +0000
committerWarner Losh <imp@FreeBSD.org>2021-07-14 02:39:30 +0000
commit27d997be9750242c789faed04b68afd6e83068a3 (patch)
tree26bdd0831bfa419bbeef714d39f2799ed0fd0fd0
parent35e62b00c3342cffee042093b72a52f3f19e5263 (diff)
downloadsrc-27d997be9750242c789faed04b68afd6e83068a3.tar.gz
src-27d997be9750242c789faed04b68afd6e83068a3.zip
cardbus: move card_if.m to sys/dev/cardbus
Move card_if.m to sys/dev/cardbus since pccard is disappearing. Sponsored by: Netflix
-rw-r--r--sys/conf/files2
-rw-r--r--sys/dev/cardbus/card_if.m (renamed from sys/dev/pccard/card_if.m)0
2 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 8b16621c69a7..245bbcb01374 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1405,6 +1405,7 @@ dev/bwn/if_bwn_phy_lp.c optional bwn bhnd
dev/bwn/if_bwn_phy_n.c optional bwn bhnd
dev/bwn/if_bwn_util.c optional bwn bhnd
dev/cadence/if_cgem.c optional cgem fdt
+dev/cardbus/card_if.m standard
dev/cardbus/cardbus.c optional cardbus
dev/cardbus/cardbus_cis.c optional cardbus
dev/cardbus/cardbus_device.c optional cardbus
@@ -2628,7 +2629,6 @@ dev/ow/own_if.m optional ow
dev/ow/ow_temp.c optional ow_temp
dev/ow/owc_gpiobus.c optional owc gpio
dev/pbio/pbio.c optional pbio isa
-dev/pccard/card_if.m standard
dev/pccard/pccard.c optional pccard
dev/pccard/pccard_cis.c optional pccard
dev/pccard/pccard_cis_quirks.c optional pccard
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/cardbus/card_if.m
index e1b816807a48..e1b816807a48 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/cardbus/card_if.m