From ae5d2804aefedcd43924712dc974621255e9eb39 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 24 May 2009 17:13:14 +0000 Subject: [PATCH] move the hostap firmware kernel config options to KCONFIG for the hostap package to keep it consistent git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16031 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/hostap-driver/Makefile | 2 +- target/linux/generic-2.6/config-2.6.21 | 2 -- target/linux/generic-2.6/config-2.6.23 | 2 -- target/linux/generic-2.6/config-2.6.25 | 2 -- target/linux/generic-2.6/config-2.6.27 | 2 -- target/linux/generic-2.6/config-2.6.28 | 2 -- target/linux/generic-2.6/config-2.6.30 | 2 -- 7 files changed, 1 insertion(+), 13 deletions(-) diff --git a/package/hostap-driver/Makefile b/package/hostap-driver/Makefile index ccea892a0..85a4228b6 100644 --- a/package/hostap-driver/Makefile +++ b/package/hostap-driver/Makefile @@ -46,7 +46,7 @@ define KernelPackage/hostap $(call KernelPackage/hostap/Default) TITLE:=Host AP support for Prism2/2.5/3 DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +!LINUX_2_6_29&&!LINUX_2_6_30:kmod-ieee80211 +LINUX_2_6_29||LINUX_2_6_30:kmod-lib80211 +wireless-tools - KCONFIG:=CONFIG_HOSTAP + KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y PROVIDES:=kmod-hostap endef diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21 index 4ca8d5ca7..c7d1a208e 100644 --- a/target/linux/generic-2.6/config-2.6.21 +++ b/target/linux/generic-2.6/config-2.6.21 @@ -378,8 +378,6 @@ CONFIG_HAMRADIO=y # CONFIG_HID_FF is not set # CONFIG_HIPPI is not set # CONFIG_HOSTAP_CS is not set -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP is not set # CONFIG_HOSTAP_PCI is not set # CONFIG_HOSTAP_PLX is not set diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23 index a4d1b5690..bc1d29749 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -411,8 +411,6 @@ CONFIG_HAMRADIO=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HOSTAP_CS is not set -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP is not set # CONFIG_HOSTAP_PCI is not set # CONFIG_HOSTAP_PLX is not set diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index 16e66aab9..0082e4e0b 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -435,8 +435,6 @@ CONFIG_HAMRADIO=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HOSTAP_CS is not set -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP is not set # CONFIG_HOSTAP_PCI is not set # CONFIG_HOSTAP_PLX is not set diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27 index a26a59fc5..63a066cca 100644 --- a/target/linux/generic-2.6/config-2.6.27 +++ b/target/linux/generic-2.6/config-2.6.27 @@ -482,8 +482,6 @@ CONFIG_HAMRADIO=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HOSTAP_CS is not set -# CONFIG_HOSTAP_FIRMWARE is not set -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set # CONFIG_HOSTAP is not set # CONFIG_HOSTAP_PCI is not set # CONFIG_HOSTAP_PLX is not set diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28 index fd69f8187..25a0dd84d 100644 --- a/target/linux/generic-2.6/config-2.6.28 +++ b/target/linux/generic-2.6/config-2.6.28 @@ -530,8 +530,6 @@ CONFIG_HAMRADIO=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HOSTAP_CS is not set -# CONFIG_HOSTAP_FIRMWARE is not set -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set # CONFIG_HOSTAP is not set # CONFIG_HOSTAP_PCI is not set # CONFIG_HOSTAP_PLX is not set diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30 index 542b84731..f2be697a2 100644 --- a/target/linux/generic-2.6/config-2.6.30 +++ b/target/linux/generic-2.6/config-2.6.30 @@ -564,8 +564,6 @@ CONFIG_HAMRADIO=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HOSTAP_CS is not set -# CONFIG_HOSTAP_FIRMWARE is not set -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set # CONFIG_HOSTAP is not set # CONFIG_HOSTAP_PCI is not set # CONFIG_HOSTAP_PLX is not set -- 2.35.1