[PATCH] input: Compile keymap only if necessary

[Sascha Hauer]

On Mon, Jul 04, 2016 at 04:48:10PM +0300, Antony Pavlov wrote:
> On Sun, 19 Jun 2016 20:53:33 +0300
> Alexander Shiyan <shc_work at mail.ru> wrote:
> 
> > Signed-off-by: Alexander Shiyan <shc_work at mail.ru>
> > ---
> >  drivers/input/Makefile   | 3 +--
> >  include/input/keyboard.h | 4 ++++
> >  2 files changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/input/Makefile b/drivers/input/Makefile
> > index 7d2c194..e694a98 100644
> > --- a/drivers/input/Makefile
> > +++ b/drivers/input/Makefile
> > @@ -1,8 +1,7 @@
> > -obj-$(CONFIG_INPUT) += input.o
> > +obj-$(CONFIG_INPUT) += input.o keymap.o
> >  obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o
> >  obj-$(CONFIG_KEYBOARD_USB) += usb_kbd.o
> >  obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
> >  obj-$(CONFIG_KEYBOARD_TWL6030) += twl6030_pwrbtn.o
> >  obj-$(CONFIG_KEYBOARD_IMX_KEYPAD) += imx_keypad.o
> >  obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o
> > -obj-y += keymap.o
> > diff --git a/include/input/keyboard.h b/include/input/keyboard.h
> > index d1f5bf5..e205a51 100644
> > --- a/include/input/keyboard.h
> > +++ b/include/input/keyboard.h
> > @@ -1,6 +1,8 @@
> >  #ifndef __INPUT_KEYBOARD_H
> >  #define __INPUT_KEYBOARD_H
> >  
> > +#ifdef CONFIG_INPUT
> > +
> 
> Do we really need this?

Erm, no, we shouldn't need this. I removed this hunk from the patch.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |