mac80211: fix mac address handling for multiple phy/vif

[openwrt.git] / package / kernel / modules / firewire.mk

diff --git a/package/kernel/modules/firewire.mk b/package/kernel/modules/firewire.mk
index 96b76ff..6ba02cd 100644 (file)
--- a/package/kernel/modules/firewire.mk
+++ b/package/kernel/modules/firewire.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 FIREWIRE_MENU:=FireWire support
 
 
 FIREWIRE_MENU:=FireWire support
 


@@ -17,6 +16,7 @@ endef
 define KernelPackage/ieee1394
   SUBMENU:=$(FIREWIRE_MENU)
   TITLE:=Support for FireWire
 define KernelPackage/ieee1394
   SUBMENU:=$(FIREWIRE_MENU)
   TITLE:=Support for FireWire

+  DEPENDS:=@PCI_SUPPORT

   KCONFIG:=CONFIG_IEEE1394
   FILES:=$(LINUX_DIR)/drivers/ieee1394/ieee1394.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ieee1394)
   KCONFIG:=CONFIG_IEEE1394
   FILES:=$(LINUX_DIR)/drivers/ieee1394/ieee1394.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ieee1394)


@@ -47,7 +47,9 @@ $(eval $(call KernelPackage,ohci1394))
 define KernelPackage/sbp2
   $(call firewiredep,kmod-ohci1394)
   TITLE:=Support for SBP-2 devices over FireWire
 define KernelPackage/sbp2
   $(call firewiredep,kmod-ohci1394)
   TITLE:=Support for SBP-2 devices over FireWire

-  KCONFIG:=CONFIG_IEEE1394_SBP2
+  KCONFIG:= \
+       CONFIG_IEEE1394_SBP2 \
+       CONFIG_IEEE1394_SBP2_PHYS_DMA=n

   FILES:=$(LINUX_DIR)/drivers/ieee1394/sbp2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,sbp2)
 endef
   FILES:=$(LINUX_DIR)/drivers/ieee1394/sbp2.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,sbp2)
 endef