From af1eb7ec46aededaafaccd23e9bf44cf82b17495 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 20 Jun 2010 13:44:19 +0000
Subject: [PATCH] deselect wpad-mini in wl profile instead of adding it to all
 other profiles, slightly change titles

SVN-Revision: 21852
---
 target/linux/brcm47xx/Makefile                     | 2 +-
 target/linux/brcm47xx/profiles/100-Broadcom-b43.mk | 4 ++--
 target/linux/brcm47xx/profiles/101-Broadcom-wl.mk  | 4 ++--
 target/linux/brcm47xx/profiles/105-Atheros.mk      | 2 +-
 target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index eae5ca3e37..56c87e4820 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -14,7 +14,7 @@ FEATURES:=squashfs usb pcmcia
 LINUX_VERSION:=2.6.32.14
 
 include $(INCLUDE_DIR)/target.mk
-DEFAULT_PACKAGES += kmod-switch kmod-diag nvram
+DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
 
 define Target/Description
 	Build firmware images for Broadcom based routers
diff --git a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
index 1242180092..df8d37baff 100644
--- a/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
+++ b/target/linux/brcm47xx/profiles/100-Broadcom-b43.mk
@@ -6,8 +6,8 @@
 #
 
 define Profile/Broadcom-b43
-  NAME:=Broadcom BCM43xx WiFi - "b43" driver (default)
-  PACKAGES:=wpad-mini kmod-b43 kmod-b43legacy
+  NAME:=Broadcom BCM43xx WiFi (b43, default)
+  PACKAGES:=kmod-b43 kmod-b43legacy
 endef
 
 define Profile/Broadcom-b43/Description
diff --git a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk b/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
index 4cfb089eab..d67298cc9d 100644
--- a/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
+++ b/target/linux/brcm47xx/profiles/101-Broadcom-wl.mk
@@ -6,8 +6,8 @@
 #
 
 define Profile/Broadcom-wl
-  NAME:=Broadcom BCM43xx WiFi - "wl" driver (proprietary)
-  PACKAGES:=kmod-brcm-wl wlc nas
+  NAME:=Broadcom BCM43xx WiFi (wl, proprietary)
+  PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-wl/Description
diff --git a/target/linux/brcm47xx/profiles/105-Atheros.mk b/target/linux/brcm47xx/profiles/105-Atheros.mk
index 889f4bc74f..46046a1fa5 100644
--- a/target/linux/brcm47xx/profiles/105-Atheros.mk
+++ b/target/linux/brcm47xx/profiles/105-Atheros.mk
@@ -6,7 +6,7 @@
 #
 
 define Profile/Atheros
-  NAME:=Atheros WiFi
+  NAME:=Atheros WiFi (madwifi)
   PACKAGES:=kmod-madwifi
 endef
 
diff --git a/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk b/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk
index 2dea0d5421..bf8630388e 100644
--- a/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk
+++ b/target/linux/brcm47xx/profiles/WL500GPv1-ATH.mk
@@ -6,7 +6,7 @@
 #
 
 define Profile/WL500GPv1
-  NAME:=ASUS WL-500g Premium v1 (Atheros WiFi)
+  NAME:=ASUS WL-500g Premium v1 (Atheros WiFi using madwifi)
   PACKAGES:=kmod-madwifi kmod-usb-core kmod-usb-uhci kmod-usb2
 endef