From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751758Ab1JJRZW (ORCPT ); Mon, 10 Oct 2011 13:25:22 -0400 Received: from hqemgate03.nvidia.com ([216.228.121.140]:14126 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752472Ab1JJRZS convert rfc822-to-8bit (ORCPT ); Mon, 10 Oct 2011 13:25:18 -0400 X-PGP-Universal: processed; by hqnvupgp05.nvidia.com on Mon, 10 Oct 2011 10:25:08 -0700 From: Stephen Warren To: Marc Dietrich , Mikael Pettersson , "Olof Johansson (olof@lixom.net)" , "Greg KH (gregkh@suse.de)" CC: "linux-tegra@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Julian Andres Klode , "devel@driverdev.osuosl.org" , Leon Romanovsky , "Colin Cross (ccross@android.com)" Date: Mon, 10 Oct 2011 10:25:07 -0700 Subject: RE: [PATCH] fix drivers/staging/nvec linkage error when keyboard is disabled Thread-Topic: [PATCH] fix drivers/staging/nvec linkage error when keyboard is disabled Thread-Index: AcyGmuaqNGEX8DKcTnShuQvMFzY3agA1V1RA Message-ID: <74CDBE0F657A3D45AFBB94109FB122FF173B23B539@HQMAIL01.nvidia.com> References: <20112.34922.209107.730268@pilspetsen.it.uu.se> <1534774.fR3YHUzZE9@fb07-iapwap2> In-Reply-To: <1534774.fR3YHUzZE9@fb07-iapwap2> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Marc Dietrich wrote at Sunday, October 09, 2011 9:48 AM: > Hi Mikael, > > thanks for review. The nvec driver received some overhaul in the 3.1 release cycle > and he fruids can be viewed in linux-next tree. The nvec client drivers were > converted to mfd children in the mean time. This solves the build error, but is not > very flexible. We are planing to move the mfd stuct to the board file(s) in the next > cycle. Indeed, the code in v3.1-rc9 is quite different to that in linux-next, so this exact problem doesn't exist in linux-next. However, don't we still want to solve build problems for the final v3.1 release, or a stable update to that? As such, Acked-by: Stephen Warren I also CC'd the staging maintainer Greg KH and Tegra maintainers Olof and Colin on this email. > Also the maintainers were added. If you still find problems, please send email to the > linux driver developemnt project and cc Julian and me. You may also check our > development tree at http://gitorious.org/ac100/marvin24s-tree. > > Thanks > > Marc > > Am Samstag, 8. Oktober 2011, 19:29:14 schrieb Mikael Pettersson: > > Building linux-3.1-rc9 for the Tegra ARM SoC with CONFIG_MFD_NVEC=y > > and CONFIG_KEYBOARD_NVEC=n results in the following linkage error: > > > > drivers/built-in.o: In function `tegra_nvec_probe': > > /tmp/linux-3.1-rc9/drivers/staging/nvec/nvec.c:373: undefined reference to > > `nvec_kbd_init' make: *** [.tmp_vmlinux1] Error 1 > > > > Fixed by #ifdef:ing the call to nvec_kbd_init(), similar to the > > existing #ifdef CONFIG_SERIO_NVEC_PS2 around the nvec_ps2() call. > > > > Signed-off-by: Mikael Pettersson > > --- > > > > --- linux-3.1-rc9/drivers/staging/nvec/nvec.c.~1~ 2011-10-08 16:28:20.000000000 > > +0200 +++ linux-3.1-rc9/drivers/staging/nvec/nvec.c 2011-10-08 19:09:18.000000000 > > +0200 @@ -370,7 +370,9 @@ static int __devinit tegra_nvec_probe(st > > nvec_write_async(nvec, EC_ENABLE_EVENT_REPORTING, > > sizeof(EC_ENABLE_EVENT_REPORTING)); > > > > +#ifdef CONFIG_KEYBOARD_NVEC > > nvec_kbd_init(nvec); > > +#endif > > #ifdef CONFIG_SERIO_NVEC_PS2 > > nvec_ps2(nvec); > > #endif -- nvpublic