lkml.org 
[lkml]   [2011]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] fix drivers/staging/nvec linkage error when keyboard is disabled
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 <mikpe@it.uu.se>
---

--- 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

\
 
 \ /
  Last update: 2011-10-08 20:03    [W:0.062 / U:4.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site