From patchwork Sat Oct 8 17:29:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: fix drivers/staging/nvec linkage error when keyboard is disabled Date: Sat, 08 Oct 2011 07:29:14 -0000 From: Mikael Pettersson X-Patchwork-Id: 119269 Message-Id: <20112.34922.209107.730268@pilspetsen.it.uu.se> To: linux-tegra@vger.kernel.org Cc: linux-kernel@vger.kernel.org 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 --- -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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