From patchwork Thu Sep 30 19:21:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 221052 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 o8UJLLPu000556 for ; Thu, 30 Sep 2010 19:21:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756274Ab0I3TU4 (ORCPT ); Thu, 30 Sep 2010 15:20:56 -0400 Received: from he.sipsolutions.net ([78.46.109.217]:38579 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756259Ab0I3TUz (ORCPT ); Thu, 30 Sep 2010 15:20:55 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1P1OgV-0006Zw-Ds; Thu, 30 Sep 2010 21:20:51 +0200 Subject: [PATCH] cfg80211: remove spurious __KERNEL__ ifdef From: Johannes Berg To: John Linville Cc: Joe Perches , "linux-wireless@vger.kernel.org" Date: Thu, 30 Sep 2010 21:21:25 +0200 Message-ID: <1285874485.5137.16.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 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]); Thu, 30 Sep 2010 19:21:21 +0000 (UTC) --- wireless-testing.orig/include/net/cfg80211.h 2010-09-30 21:18:46.000000000 +0200 +++ wireless-testing/include/net/cfg80211.h 2010-09-30 21:18:51.000000000 +0200 @@ -2551,8 +2551,6 @@ void cfg80211_cqm_rssi_notify(struct net enum nl80211_cqm_rssi_threshold_event rssi_event, gfp_t gfp); -#ifdef __KERNEL__ - /* Logging, debugging and troubleshooting/diagnostic helpers. */ /* wiphy_printk helpers, similar to dev_printk */ @@ -2599,6 +2597,4 @@ void cfg80211_cqm_rssi_notify(struct net #define wiphy_WARN(wiphy, format, args...) \ WARN(1, "wiphy: %s\n" format, wiphy_name(wiphy), ##args); -#endif - #endif /* __NET_CFG80211_H */