From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx2.suse.de ([195.135.220.15]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a1yrq-0005Ju-8D for ath10k@lists.infradead.org; Thu, 26 Nov 2015 15:53:54 +0000 Subject: Re: [PATCH] ath10: Fix build with CONFIG_THERMAL=m References: <201511260039.iQbaOe1h%fengguang.wu@intel.com> <1448552198-26911-1-git-send-email-mmarek@suse.com> From: Michal Marek Message-ID: <56572AFB.20309@suse.cz> Date: Thu, 26 Nov 2015 16:53:31 +0100 MIME-Version: 1.0 In-Reply-To: <1448552198-26911-1-git-send-email-mmarek@suse.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: Kalle Valo Cc: fengguang.wu@intel.com, kbuild-all@01.org, ath10k@lists.infradead.org, linux-kbuild@vger.kernel.org T24gMjAxNS0xMS0yNiAxNjozNiwgTWljaGFsIE1hcmVrIHdyb3RlOgo+IEFmdGVyIGNvbW1pdCBj ZjRmMjE5MzhlMTMgKCJrYnVpbGQ6IEFsbG93IHRvIHNwZWNpZnkgY29tcG9zaXRlIG1vZHVsZXMK PiB3aXRoIG1vZG5hbWUtbSIpLCB0aGVybWFsLmMgZ2V0cyBpbmNsdWRlZCBpbiB0aGUgZHJpdmVy IGFuZCB0aGUgYnVpbGQKPiBmYWlscyB3aXRoCj4gCj4gZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRo L2F0aDEway90aGVybWFsLmM6MTE5OjY6IGVycm9yOiByZWRlZmluaXRpb24gb2Yg4oCYYXRoMTBr X3RoZXJtYWxfZXZlbnRfdGVtcGVyYXR1cmXigJkKPiBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgv YXRoMTBrL3RoZXJtYWwuaDo1NDoyMDogbm90ZTogcHJldmlvdXMgZGVmaW5pdGlvbiBvZiDigJhh dGgxMGtfdGhlcm1hbF9ldmVudF90ZW1wZXJhdHVyZeKAmSB3YXMgaGVyZQo+IGRyaXZlcnMvbmV0 L3dpcmVsZXNzL2F0aC9hdGgxMGsvdGhlcm1hbC5jOjEzNjo2OiBlcnJvcjogcmVkZWZpbml0aW9u IG9mIOKAmGF0aDEwa190aGVybWFsX3NldF90aHJvdHRsaW5n4oCZCj4gZHJpdmVycy9uZXQvd2ly ZWxlc3MvYXRoL2F0aDEway90aGVybWFsLmg6NTk6MjA6IG5vdGU6IHByZXZpb3VzIGRlZmluaXRp b24gb2Yg4oCYYXRoMTBrX3RoZXJtYWxfc2V0X3Rocm90dGxpbmfigJkgd2FzIGhlcmUKPiBkcml2 ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoMTBrL3RoZXJtYWwuYzoxNjI6NTogZXJyb3I6IHJlZGVm aW5pdGlvbiBvZiDigJhhdGgxMGtfdGhlcm1hbF9yZWdpc3RlcuKAmQo+IGRyaXZlcnMvbmV0L3dp cmVsZXNzL2F0aC9hdGgxMGsvdGhlcm1hbC5oOjQ1OjE5OiBub3RlOiBwcmV2aW91cyBkZWZpbml0 aW9uIG9mIOKAmGF0aDEwa190aGVybWFsX3JlZ2lzdGVy4oCZIHdhcyBoZXJlCj4gZHJpdmVycy9u ZXQvd2lyZWxlc3MvYXRoL2F0aDEway90aGVybWFsLmM6MjE2OjY6IGVycm9yOiByZWRlZmluaXRp b24gb2Yg4oCYYXRoMTBrX3RoZXJtYWxfdW5yZWdpc3RlcuKAmQo+IGRyaXZlcnMvbmV0L3dpcmVs ZXNzL2F0aC9hdGgxMGsvdGhlcm1hbC5oOjUwOjIwOiBub3RlOiBwcmV2aW91cyBkZWZpbml0aW9u IG9mIOKAmGF0aDEwa190aGVybWFsX3VucmVnaXN0ZXLigJkgd2FzIGhlcmUKPiAKPiBDaGFuZ2Ug dGhlICNpZmRlZiB0byByZWZsZWN0IHRoZSBuZXcga2J1aWxkIGJlaGF2aW9yLgoKRm9yZ290IHRv IG1lbnRpb246IFRoZSBhYm92ZSBjb21taXQgb25seSBleGlzdHMgaW4gdGhlIGtidWlsZCB0cmVl LCBzbyBJCndpbGwgYXBwbHkgdGhpcyB0aGVyZSBhcyB3ZWxsLCB1bmxlc3MgYW55Ym9keSBvYmpl Y3RzLiBBcHBseWluZyB0aGUKcGF0Y2ggdG8gdGhlIGF0aCB0cmVlIHdvdWxkIGJyZWFrIHRoZSBv dGhlciB3YXkgYXJvdW5kLgoKTWljaGFsCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwphdGgxMGsgbWFpbGluZyBsaXN0CmF0aDEwa0BsaXN0cy5pbmZyYWRl YWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vYXRoMTBr Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:51981 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751065AbbKZPxd (ORCPT ); Thu, 26 Nov 2015 10:53:33 -0500 Subject: Re: [PATCH] ath10: Fix build with CONFIG_THERMAL=m References: <201511260039.iQbaOe1h%fengguang.wu@intel.com> <1448552198-26911-1-git-send-email-mmarek@suse.com> From: Michal Marek Message-ID: <56572AFB.20309@suse.cz> Date: Thu, 26 Nov 2015 16:53:31 +0100 MIME-Version: 1.0 In-Reply-To: <1448552198-26911-1-git-send-email-mmarek@suse.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: Kalle Valo Cc: linux-kbuild@vger.kernel.org, kbuild-all@01.org, fengguang.wu@intel.com, ath10k@lists.infradead.org On 2015-11-26 16:36, Michal Marek wrote: > After commit cf4f21938e13 ("kbuild: Allow to specify composite modules > with modname-m"), thermal.c gets included in the driver and the build > fails with > > drivers/net/wireless/ath/ath10k/thermal.c:119:6: error: redefinition of ‘ath10k_thermal_event_temperature’ > drivers/net/wireless/ath/ath10k/thermal.h:54:20: note: previous definition of ‘ath10k_thermal_event_temperature’ was here > drivers/net/wireless/ath/ath10k/thermal.c:136:6: error: redefinition of ‘ath10k_thermal_set_throttling’ > drivers/net/wireless/ath/ath10k/thermal.h:59:20: note: previous definition of ‘ath10k_thermal_set_throttling’ was here > drivers/net/wireless/ath/ath10k/thermal.c:162:5: error: redefinition of ‘ath10k_thermal_register’ > drivers/net/wireless/ath/ath10k/thermal.h:45:19: note: previous definition of ‘ath10k_thermal_register’ was here > drivers/net/wireless/ath/ath10k/thermal.c:216:6: error: redefinition of ‘ath10k_thermal_unregister’ > drivers/net/wireless/ath/ath10k/thermal.h:50:20: note: previous definition of ‘ath10k_thermal_unregister’ was here > > Change the #ifdef to reflect the new kbuild behavior. Forgot to mention: The above commit only exists in the kbuild tree, so I will apply this there as well, unless anybody objects. Applying the patch to the ath tree would break the other way around. Michal