From patchwork Fri Nov  6 21:53:45 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philip Prindeville <philipp_subx@redfish-solutions.com>
X-Patchwork-Id: 58108
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA6LsCah011608
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 6 Nov 2009 21:54:12 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758320AbZKFVx7 (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Fri, 6 Nov 2009 16:53:59 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758555AbZKFVx7
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Fri, 6 Nov 2009 16:53:59 -0500
Received: from mail.redfish-solutions.com ([66.232.79.143]:46605 "EHLO
	mail.redfish-solutions.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1758296AbZKFVx7 (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Fri, 6 Nov 2009 16:53:59 -0500
Received: from [192.168.10.7] (builder.redfish-solutions.com [192.168.10.7])
	(authenticated bits=0)
	by mail.redfish-solutions.com (8.14.3/8.14.3) with ESMTP id
	nA6Lrk77004438
	(version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256
	verify=NO); Fri, 6 Nov 2009 14:53:47 -0700
Message-ID: <4AF49AE9.1040603@redfish-solutions.com>
Date: Fri, 06 Nov 2009 13:53:45 -0800
From: "Philip A. Prindeville" <philipp_subx@redfish-solutions.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.4pre) Gecko/20090922 Fedora/3.0-2.7.b4.fc11
	Lightning/1.0pre Thunderbird/3.0b4
MIME-Version: 1.0
To: John Linville <linville@tuxdriver.com>
CC: wireless <linux-wireless@vger.kernel.org>,
	"Luis R. Rodriguez" <mcgrof@gmail.com>, Pavel Roskin <proski@gnu.org>
Subject: [PATCH] Don't build SSB modules when SSB isn't present
X-Scanned-By: MIMEDefang 2.67 on 192.168.1.3
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/config.mk b/config.mk
index ce70832..49be2d0 100644
--- a/config.mk
+++ b/config.mk
@@ -9,6 +9,8 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),)
  CONFIG_PCI=y
  CONFIG_USB=y
  CONFIG_PCMCIA=y
+ CONFIG_SSB_POSSIBLE=y
+ CONFIG_SSB=m
 else
 include $(KLIB_BUILD)/.config
 endif
@@ -218,6 +220,11 @@ CONFIG_IPW2200_QOS=y
 #
 # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface

+ifneq ($(CONFIG_SSB),)
+# Sonics Silicon Backplane
+CONFIG_SSB_SPROM=y
+# CONFIG_SSB_DEBUG=y
+
 CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
@@ -229,6 +236,7 @@ endif
 # CONFIG_SSB_DEBUG=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+endif

 CONFIG_P54_PCI=m

@@ -397,12 +405,6 @@ CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1271=m

-# Sonics Silicon Backplane
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-# CONFIG_SSB_DEBUG=y
-
 ifdef CONFIG_COMPAT_WIRELESS_27
 CONFIG_LIBERTAS=n
 else