Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[u-boot] / drivers / input / ps2mult.c

diff --git a/drivers/input/ps2mult.c b/drivers/input/ps2mult.c
index 9515a0fbf544e67ab52c33242c3861ea39d1667b..ecd585323f92107ea32470d4df3c511447f02ee0 100644 (file)
--- a/drivers/input/ps2mult.c
+++ b/drivers/input/ps2mult.c
@@ -16,8 +16,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_PS2MULT
-
 #include <pc_keyb.h>
 #include <asm/atomic.h>
 #include <ps2mult.h>
@@ -462,5 +460,3 @@ int ps2mult_request_irq(void (*handler)(void *))
 
        return 0;
 }
-
-#endif /* CONFIG_PS2MULT */