diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/input/Makefile | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/input/Makefile')
| -rw-r--r-- | drivers/input/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/Makefile b/drivers/input/Makefile index da575deb3c7a..b4cd10653c4f 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile | |||
| @@ -13,7 +13,6 @@ obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o | |||
| 13 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o | 13 | obj-$(CONFIG_INPUT_JOYDEV) += joydev.o |
| 14 | obj-$(CONFIG_INPUT_EVDEV) += evdev.o | 14 | obj-$(CONFIG_INPUT_EVDEV) += evdev.o |
| 15 | obj-$(CONFIG_INPUT_TSDEV) += tsdev.o | 15 | obj-$(CONFIG_INPUT_TSDEV) += tsdev.o |
| 16 | obj-$(CONFIG_INPUT_POWER) += power.o | ||
| 17 | obj-$(CONFIG_INPUT_EVBUG) += evbug.o | 16 | obj-$(CONFIG_INPUT_EVBUG) += evbug.o |
| 18 | 17 | ||
| 19 | obj-$(CONFIG_INPUT_KEYBOARD) += keyboard/ | 18 | obj-$(CONFIG_INPUT_KEYBOARD) += keyboard/ |