diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:56 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:56 -0300 |
| commit | 0a3437aa52c010dc2ab10b9778a383fef436382c (patch) | |
| tree | b2f879569f9d9deb23e4d7accb103d30a64e1527 /sys/modules | |
| parent | 6a0f7868a911546f7be04cc546e99cc803686af3 (diff) | |
| download | FreeBSD-src-0a3437aa52c010dc2ab10b9778a383fef436382c.zip FreeBSD-src-0a3437aa52c010dc2ab10b9778a383fef436382c.tar.gz | |
Revert "Importing pfSense patches net80211HEAD.tgz and conf.file.ieee80211.diff"
This reverts commit 6ee75bdd7bf7c20359dd6e38c243586cb062edea.
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/ath/Makefile | 1 | ||||
| -rw-r--r-- | sys/modules/iwnfw/Makefile | 14 | ||||
| -rw-r--r-- | sys/modules/iwnfw/iwn100/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/iwnfw/iwn105/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/iwnfw/iwn135/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/iwnfw/iwn6000g2b/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/wpi/Makefile | 2 |
7 files changed, 4 insertions, 33 deletions
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile index c5a40c9..33a1650 100644 --- a/sys/modules/ath/Makefile +++ b/sys/modules/ath/Makefile @@ -162,6 +162,7 @@ opt_ah.h: CWARNFLAGS.ah_regdomain.c= ${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW} # XXX Work around clang warnings, until maintainer approves fix. CWARNFLAGS.if_ath.c= ${NO_WSOMETIMES_UNINITIALIZED} +CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} # AR9300 HAL build overrides, as there's still some code to tidy up CWARNFLAGS.ar9300_eeprom.c= ${NO_WCONSTANT_CONVERSION} diff --git a/sys/modules/iwnfw/Makefile b/sys/modules/iwnfw/Makefile index 9f8009c..9075edb 100644 --- a/sys/modules/iwnfw/Makefile +++ b/sys/modules/iwnfw/Makefile @@ -1,17 +1,5 @@ # $FreeBSD$ -SUBDIR= iwn100 \ - iwn105 \ - iwn135 \ - iwn1000 \ - iwn2000 \ - iwn2030 \ - iwn4965 \ - iwn5000 \ - iwn5150 \ - iwn6000 \ - iwn6000g2a \ - iwn6000g2b \ - iwn6050 +SUBDIR= iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050 iwn2030 .include <bsd.subdir.mk> diff --git a/sys/modules/iwnfw/iwn100/Makefile b/sys/modules/iwnfw/iwn100/Makefile deleted file mode 100644 index c72533f..0000000 --- a/sys/modules/iwnfw/iwn100/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -KMOD= iwn100fw -IMG= iwlwifi-100-39.31.5.1 - -.include <bsd.kmod.mk> diff --git a/sys/modules/iwnfw/iwn105/Makefile b/sys/modules/iwnfw/iwn105/Makefile deleted file mode 100644 index f1f3d8d..0000000 --- a/sys/modules/iwnfw/iwn105/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -KMOD= iwn105fw -IMG= iwlwifi-105-6-18.168.6.1 - -.include <bsd.kmod.mk> diff --git a/sys/modules/iwnfw/iwn135/Makefile b/sys/modules/iwnfw/iwn135/Makefile deleted file mode 100644 index fd21ac4..0000000 --- a/sys/modules/iwnfw/iwn135/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -KMOD= iwn135fw -IMG= iwlwifi-135-6-18.168.6.1 - -.include <bsd.kmod.mk> diff --git a/sys/modules/iwnfw/iwn6000g2b/Makefile b/sys/modules/iwnfw/iwn6000g2b/Makefile index ce76755..71a2607 100644 --- a/sys/modules/iwnfw/iwn6000g2b/Makefile +++ b/sys/modules/iwnfw/iwn6000g2b/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= iwn6000g2bfw -IMG= iwlwifi-6000g2b-18.168.6.1 +IMG= iwlwifi-6000g2b-17.168.5.2 .include <bsd.kmod.mk> diff --git a/sys/modules/wpi/Makefile b/sys/modules/wpi/Makefile index 2e0da73..1e2383f 100644 --- a/sys/modules/wpi/Makefile +++ b/sys/modules/wpi/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/wpi KMOD = if_wpi -SRCS = if_wpi.c device_if.h bus_if.h pci_if.h opt_wpi.h opt_wlan.h +SRCS = if_wpi.c device_if.h bus_if.h pci_if.h opt_wlan.h .include <bsd.kmod.mk> |
