public inbox for linux-wireless@vger.kernel.org
 help / color / mirror / Atom feed
From: Yingying Zhao <yingying.zhao@linux.intel.com>
To: "Luis R. Rodriguez" <mcgrof@winlab.rutgers.edu>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH]compat-2.6: fix compiling configurations for iwlwifi
Date: Thu, 17 Jul 2008 16:15:54 +0800	[thread overview]
Message-ID: <20080717081554.GA1279@amber-desktop.bj.intel.com> (raw)

Latest iwlwifi in wireless-testing removed CONFIG_IWL4965_HT and
introduced CONFIG_IWL5000 for Intel Wireless WiFi 5000AGN support
which is built in IWL4965 module. This patch also enables IWLWIFI_LEDS,
IWLWIFI_RFKILL,IWL3945_LEDS IWLWIFI_DEBUG for iwlwifi build by default.

Signed-off-by: Zhao Yingying <yingying.zhao@intel.com>
---
 config.mk |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/config.mk b/config.mk
index b1fb68e..cafadfa 100644
--- a/config.mk
+++ b/config.mk
@@ -15,6 +15,7 @@ endif
 
 # Wireless subsystem stuff
 CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
 
 # Enable QOS for 2.6.22, we'll do some hacks here to enable it.
 # You will need this for HT support (802.11n) and WME (802.11e).
@@ -77,7 +78,24 @@ CONFIG_IWLWIFI=m
 CONFIG_IWLCORE=m
 CONFIG_IWL3945=m
 CONFIG_IWL4965=m
-CONFIG_IWL4965_HT=y
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLWIFI_RFKILL=y
+CONFIG_IWL3945_LEDS=y
+CONFIG_IWL5000=y
+
+ifeq ($(CONFIG_IWL5000),y)
+ifeq ($(CONFIG_IWL4965),)
+$(warning "WARNING: CONFIG_IWL5000 requires CONFIG_IWL4965 is configured as m.")
+CONFIG_IWL4965=m
+endif # CONFIG_IWL4965 is empty
+endif # CONFIG_IWL5000 is y
+
+CONFIG_IWLWIFI_DEBUG=y
+
+ifeq ($(CONFIG_MAC80211_DEBUGFS),y)
+CONFIG_IWLWIFI_DEBUGFS=y
+endif
+
 CONFIG_B43=m
 # B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
 # Example, bcm4318:

             reply	other threads:[~2008-07-17  8:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-17  8:15 Yingying Zhao [this message]
2008-07-17  8:29 ` [PATCH]compat-2.6: fix compiling configurations for iwlwifi Tomas Winkler
2008-07-17  9:48   ` Luis R. Rodriguez
2008-07-17 10:04     ` Yingying Zhao
2008-07-17 10:07       ` Luis R. Rodriguez
2008-07-17 13:21         ` Luis R. Rodriguez
2008-07-17 16:05           ` Luis R. Rodriguez
2008-07-17 16:12             ` Luis R. Rodriguez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080717081554.GA1279@amber-desktop.bj.intel.com \
    --to=yingying.zhao@linux.intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=mcgrof@winlab.rutgers.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox