From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbcBGGD4 (ORCPT ); Sun, 7 Feb 2016 01:03:56 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:53909 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751066AbcBGGDz (ORCPT ); Sun, 7 Feb 2016 01:03:55 -0500 Date: Sat, 6 Feb 2016 22:03:54 -0800 From: Greg Kroah-Hartman To: Arnd Bergmann Cc: Glen Lee , devel@driverdev.osuosl.org, Chris Park , Austin Shin , linux-wireless@vger.kernel.org, Johnny Kim , linux-kernel@vger.kernel.org, Tony Cho , Leo Kim , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] staging: wilc1000: fix compilation without CONFIG_PM Message-ID: <20160207060354.GA2714@kroah.com> References: <1454685729-3663377-1-git-send-email-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454685729-3663377-1-git-send-email-arnd@arndb.de> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 05, 2016 at 04:21:50PM +0100, Arnd Bergmann wrote: > After the addition of the wakeup code in wilc1000, it no longer > builds when CONFIG_PM is disabled: > > drivers/staging/wilc1000/wilc_wfi_cfgoperations.c: In function 'wilc_create_wiphy': > drivers/staging/wilc1000/wilc_wfi_cfgoperations.c:2632:13: error: 'struct wiphy' has no member named 'wowlan' > wdev->wiphy->wowlan = &wowlan_support; > > This marks the wowlan_support variable as __maybe_unused and hides > the reference when CONFIG_PM is disabled to avoid the build error. > > Signed-off-by: Arnd Bergmann > Fixes: 73584a40d748 ("staging: wilc1000: add ops resuem/suspend/wakeup in cfg80211") > --- > drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) A different patch was sent just before yours. Actually 2 different ones... thanks, greg k-h