git: cabbfa3e0723 - main - pccard: Move power_if.m from pccard to cardbus

[Warner Losh]

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=cabbfa3e072392e6e105d733547a07ced449a044

commit cabbfa3e072392e6e105d733547a07ced449a044
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-01-08 00:00:23 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-01-08 00:05:29 +0000

    pccard: Move power_if.m from pccard to cardbus
    
    power_if.m is used by both pccard and cardbus. Move it into cardbus.
---
 sys/conf/files                         | 2 +-
 sys/dev/{pccard => cardbus}/power_if.m | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/conf/files b/sys/conf/files
index 6597d9e471a4..4a5421936558 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1408,6 +1408,7 @@ dev/cadence/if_cgem.c		optional cgem fdt
 dev/cardbus/cardbus.c		optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/cardbus/cardbus_device.c	optional cardbus
+dev/cardbus/power_if.m		standard
 dev/cas/if_cas.c		optional cas
 dev/cfi/cfi_bus_fdt.c		optional cfi fdt
 dev/cfi/cfi_bus_nexus.c		optional cfi
@@ -2623,7 +2624,6 @@ dev/pccard/pccard.c		optional pccard
 dev/pccard/pccard_cis.c		optional pccard
 dev/pccard/pccard_cis_quirks.c	optional pccard
 dev/pccard/pccard_device.c	optional pccard
-dev/pccard/power_if.m		standard
 dev/pccbb/pccbb.c		optional cbb
 dev/pccbb/pccbb_pci.c		optional cbb pci
 dev/pcf/pcf.c			optional pcf
diff --git a/sys/dev/pccard/power_if.m b/sys/dev/cardbus/power_if.m
similarity index 100%
rename from sys/dev/pccard/power_if.m
rename to sys/dev/cardbus/power_if.m