Page MenuHomeFreeBSD
Files F162097882

D54694.diff
No OneTemporary
Actions

D54694.diff
View Options

diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -4,7 +4,9 @@
WITH_CONFIG_PM= 0
WITH_DEBUGFS= 0
+.if ${KERN_OPTS:MDEV_ACPI}
WITH_CONFIG_ACPI= 1
+.endif
KMOD= if_iwlwifi
@@ -60,10 +62,11 @@
.endif
.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0
-SRCS+= fw/acpi.c
+SRCS.DEV_ACPI+= fw/acpi.c
CFLAGS+= -DCONFIG_ACPI
-CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI
.endif
+# This needs to always stay on for the LinuxKPI header file.
+CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI
# Other
SRCS+= ${LINUXKPI_GENSRCS}
diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile
--- a/sys/modules/rtw89/Makefile
+++ b/sys/modules/rtw89/Makefile
@@ -4,13 +4,16 @@
WITH_CONFIG_PM= 0
WITH_DEBUGFS= 0
+.if ${KERN_OPTS:MDEV_ACPI}
+WITH_CONFIG_ACPI= 1
+.endif
KMOD= if_rtw89
SRCS= core.c
SRCS+= pci.c pci_be.c
SRCS+= chan.c mac80211.c mac.c mac_be.c phy.c phy_be.c fw.c
-SRCS+= acpi.c cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c
+SRCS+= cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c
SRCS+= util.c
SRCS+= rtw8852a.c rtw8852a_rfk.c rtw8852a_rfk_table.c rtw8852a_table.c
SRCS+= rtw8852ae.c
@@ -26,6 +29,13 @@
SRCS+= rtw8922a.c rtw8922a_rfk.c
SRCS+= rtw8922ae.c
+.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0
+SRCS.DEV_ACPI+= acpi.c
+CFLAGS+= -DCONFIG_ACPI
+.endif
+# This needs to always stay on for the LinuxKPI header file.
+CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI
+
# USB parts
#SRCS+= rtw8851bu.c rtw8852bu.c
#SRCS+= usb.c
@@ -44,7 +54,6 @@
CFLAGS+= -DKBUILD_MODNAME='"rtw89"'
CFLAGS+= -DLINUXKPI_VERSION=61700
-CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI
CFLAGS+= -I${DEVRTW89DIR}
CFLAGS+= ${LINUXKPI_INCLUDES}

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 10, 5:49 PM (46 m, 37 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34936656
Default Alt Text
D54694.diff (1 KB)

Event Timeline