diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 02:16:23 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 02:16:23 -0500 |
| commit | 5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b (patch) | |
| tree | 2f900f89d93db6b0822d8bdf4f49851c581c12a6 /drivers/input/serio/Makefile | |
| parent | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (diff) | |
| parent | bd71c2b17468a2531fb4c81ec1d73520845e97e1 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/input/serio/Makefile')
| -rw-r--r-- | drivers/input/serio/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile index 678a8599f9ff..4155197867a3 100644 --- a/drivers/input/serio/Makefile +++ b/drivers/input/serio/Makefile | |||
| @@ -13,7 +13,6 @@ obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o | |||
| 13 | obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o | 13 | obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o |
| 14 | obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o | 14 | obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o |
| 15 | obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o | 15 | obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o |
| 16 | obj-$(CONFIG_SERIO_98KBD) += 98kbd-io.o | ||
| 17 | obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o | 16 | obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o |
| 18 | obj-$(CONFIG_HP_SDC) += hp_sdc.o | 17 | obj-$(CONFIG_HP_SDC) += hp_sdc.o |
| 19 | obj-$(CONFIG_HIL_MLC) += hp_sdc_mlc.o hil_mlc.o | 18 | obj-$(CONFIG_HIL_MLC) += hp_sdc_mlc.o hil_mlc.o |