6701fedd73
Drop brcmfmac GCC 4.7 compatibility patch (included in above) Include config.mk from compat-wireless build in files for installation
74 lines
2.9 KiB
Diff
74 lines
2.9 KiB
Diff
diff -up compat-wireless-2012-01-24/config.mk.orig compat-wireless-2012-01-24/config.mk
|
|
--- compat-wireless-2012-01-24/config.mk.orig 2012-01-24 16:12:12.000000000 -0500
|
|
+++ compat-wireless-2012-01-24/config.mk 2012-01-25 13:34:20.315899694 -0500
|
|
@@ -14,6 +14,9 @@ else
|
|
include $(KLIB_BUILD)/.config
|
|
endif
|
|
|
|
+# Enable SSB module (needs to be visible in compat_autoconf.h)
|
|
+CONFIG_SSB=m
|
|
+
|
|
ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
|
|
|
|
COMPAT_LATEST_VERSION = 3
|
|
diff -up compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile.orig compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile
|
|
--- compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile.orig 2012-01-24 16:12:15.000000000 -0500
|
|
+++ compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile 2012-01-25 13:34:20.316899682 -0500
|
|
@@ -1 +1 @@
|
|
-obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
|
|
+#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
|
|
diff -up compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile
|
|
--- compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile.orig 2012-01-24 16:12:13.000000000 -0500
|
|
+++ compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile 2012-01-25 13:34:20.316899682 -0500
|
|
@@ -2,7 +2,7 @@
|
|
# Makefile for the Atheros network device drivers.
|
|
#
|
|
|
|
-obj-$(CONFIG_ATL1) += atlx/
|
|
-obj-$(CONFIG_ATL2) += atlx/
|
|
-obj-$(CONFIG_ATL1E) += atl1e/
|
|
-obj-$(CONFIG_ATL1C) += atl1c/
|
|
+#obj-$(CONFIG_ATL1) += atlx/
|
|
+#obj-$(CONFIG_ATL2) += atlx/
|
|
+#obj-$(CONFIG_ATL1E) += atl1e/
|
|
+#obj-$(CONFIG_ATL1C) += atl1c/
|
|
diff -up compat-wireless-2012-01-24/drivers/net/usb/Makefile.orig compat-wireless-2012-01-24/drivers/net/usb/Makefile
|
|
--- compat-wireless-2012-01-24/drivers/net/usb/Makefile.orig 2012-01-24 16:12:15.000000000 -0500
|
|
+++ compat-wireless-2012-01-24/drivers/net/usb/Makefile 2012-01-25 13:34:20.316899682 -0500
|
|
@@ -2,7 +2,7 @@
|
|
# Makefile for USB Network drivers
|
|
#
|
|
|
|
-obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o
|
|
-obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o
|
|
-obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
|
|
+#obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o
|
|
+#obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o
|
|
+#obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
|
|
|
|
diff -up compat-wireless-2012-01-24/Makefile.orig compat-wireless-2012-01-24/Makefile
|
|
--- compat-wireless-2012-01-24/Makefile.orig 2012-01-24 16:12:12.000000000 -0500
|
|
+++ compat-wireless-2012-01-24/Makefile 2012-01-25 13:34:58.502422295 -0500
|
|
@@ -10,8 +10,8 @@ export KLIB_BUILD ?= $(KLIB)/build
|
|
MODPROBE := /sbin/modprobe
|
|
|
|
ifneq ($(wildcard $(MODPROBE)),)
|
|
-MADWIFI=$(shell $(MODPROBE) -l ath_pci)
|
|
-OLD_IWL=$(shell $(MODPROBE) -l iwl4965)
|
|
+MADWIFI=""
|
|
+OLD_IWL=""
|
|
endif
|
|
|
|
DESTDIR?=
|
|
@@ -44,8 +44,8 @@ endif
|
|
|
|
endif
|
|
|
|
-obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
|
|
-obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/
|
|
+#obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
|
|
+#obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/
|
|
|
|
else
|
|
|