diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-11 22:01:45 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-11 22:01:45 -0800 |
commit | 01c728a246a1072fe9664b91179a47937182b0a0 (patch) | |
tree | ca1e1d997284777b28981040dae97ee668aadaee /drivers/input/keyboard/Makefile | |
parent | 554738da71004d96e06fb75f4772dfc3b0f47810 (diff) | |
parent | 50a88cb7eddb971077ae7dff76b116747c12c371 (diff) | |
download | talos-op-linux-01c728a246a1072fe9664b91179a47937182b0a0.tar.gz talos-op-linux-01c728a246a1072fe9664b91179a47937182b0a0.zip |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/keyboard/Makefile')
-rw-r--r-- | drivers/input/keyboard/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index fde89e0dd465..4dd15cf3f781 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -4,7 +4,6 @@ # Each configuration option enables a list of files. -obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o obj-$(CONFIG_KEYBOARD_ADP5520) += adp5520-keys.o obj-$(CONFIG_KEYBOARD_ADP5588) += adp5588-keys.o obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o |