From patchwork Sat Nov 13 16:44:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 322492 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oADGkSbF004032 for ; Sat, 13 Nov 2010 16:46:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756959Ab0KMQqI (ORCPT ); Sat, 13 Nov 2010 11:46:08 -0500 Received: from rcsinet10.oracle.com ([148.87.113.121]:33349 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755195Ab0KMQqF (ORCPT ); Sat, 13 Nov 2010 11:46:05 -0500 Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id oADGjeAi027750 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 13 Nov 2010 16:45:41 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by rcsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id oADGjdBr017106; Sat, 13 Nov 2010 16:45:40 GMT Received: from abhmt021.oracle.com by acsmt354.oracle.com with ESMTP id 776542341289666692; Sat, 13 Nov 2010 08:44:52 -0800 Received: from chimera.site (/173.50.240.230) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 13 Nov 2010 08:44:51 -0800 Date: Sat, 13 Nov 2010 08:44:31 -0800 From: Randy Dunlap To: Stephen Rothwell , linux-wireless@vger.kernel.org, akpm Cc: linux-next@vger.kernel.org, LKML , linville@tuxdriver.com, einette Chatre , Wey-Yi Guy Subject: [PATCH -next] iwlwifi: fix modular legacy build errors Message-Id: <20101113084431.d72d096a.randy.dunlap@oracle.com> In-Reply-To: <20101112130547.c2a3c2c1.sfr@canb.auug.org.au> References: <20101112130547.c2a3c2c1.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 13 Nov 2010 16:46:28 +0000 (UTC) --- linux-next-20101112.orig/drivers/net/wireless/iwlwifi/Makefile +++ linux-next-20101112/drivers/net/wireless/iwlwifi/Makefile @@ -2,8 +2,6 @@ obj-$(CONFIG_IWLWIFI) += iwlcore.o iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o iwlcore-objs += iwl-rx.o iwl-tx.o iwl-sta.o iwlcore-objs += iwl-scan.o iwl-led.o -iwlcore-$(CONFIG_IWL3945) += iwl-legacy.o -iwlcore-$(CONFIG_IWL4965) += iwl-legacy.o iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o @@ -17,7 +15,7 @@ iwlagn-objs += iwl-agn-lib.o iwl-agn-rx iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o -iwlagn-$(CONFIG_IWL4965) += iwl-4965.o +iwlagn-$(CONFIG_IWL4965) += iwl-4965.o iwl-legacy.o iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o iwl-agn-ict.o iwlagn-$(CONFIG_IWL5000) += iwl-5000.o iwlagn-$(CONFIG_IWL5000) += iwl-6000.o @@ -25,7 +23,7 @@ iwlagn-$(CONFIG_IWL5000) += iwl-1000.o # 3945 obj-$(CONFIG_IWL3945) += iwl3945.o -iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o +iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o iwl-legacy.o iwl3945-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-3945-debugfs.o ccflags-y += -D__CHECK_ENDIAN__