From: Michal Simek monstr@monstr.eu
Signed-off-by: Michal Simek monstr@monstr.eu --- drivers/input/Makefile | 7 ++++--- drivers/input/i8042.c | 4 ---- drivers/input/keyboard.c | 4 ---- drivers/input/pc_keyb.c | 4 ---- 4 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 2933cb6..d34c5e7 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -25,9 +25,10 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libinput.a
-COBJS-y += i8042.o -COBJS-y += keyboard.o -COBJS-y += pc_keyb.o ps2ser.o ps2mult.o +COBJS-$(CONFIG_I8042_KBD) += i8042.o +COBJS-$(CONFIG_PS2KBD) += keyboard.o pc_keyb.o +COBJS-$(CONFIG_PS2SERIAL) += ps2ser.o +COBJS-$(CONFIG_PS2MULT) += ps2mult.o
COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 22c2a4e..d152768 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -27,8 +27,6 @@
#include <common.h>
-#ifdef CONFIG_I8042_KBD - #ifdef CONFIG_USE_CPCIDVI extern u8 gt_cpcidvi_in8(u32 offset); extern void gt_cpcidvi_out8(u32 offset, u8 data); @@ -670,5 +668,3 @@ static int kbd_reset (void)
return 0; } - -#endif /* CONFIG_I8042_KBD */ diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index 54182a7..a634d76 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -11,8 +11,6 @@
#include <common.h>
-#ifdef CONFIG_PS2KBD - #include <devices.h> #include <keyboard.h>
@@ -301,5 +299,3 @@ int kbd_init (void) } return error; } - -#endif /* CONFIG_PS2KBD */ diff --git a/drivers/input/pc_keyb.c b/drivers/input/pc_keyb.c index 81d3e98..4649580 100644 --- a/drivers/input/pc_keyb.c +++ b/drivers/input/pc_keyb.c @@ -13,8 +13,6 @@
#include <common.h>
-#ifdef CONFIG_PS2KBD - #include <keyboard.h> #include <pc_keyb.h>
@@ -252,5 +250,3 @@ void pckbd_leds(unsigned char leds) kbd_send_data(KBD_CMD_SET_LEDS); kbd_send_data(leds); } - -#endif /* CONFIG_PS2KBD */