diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-12 01:01:45 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-12 01:01:45 -0500 |
| commit | 01c728a246a1072fe9664b91179a47937182b0a0 (patch) | |
| tree | ca1e1d997284777b28981040dae97ee668aadaee /drivers/input/joystick/Makefile | |
| parent | 554738da71004d96e06fb75f4772dfc3b0f47810 (diff) | |
| parent | 50a88cb7eddb971077ae7dff76b116747c12c371 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/joystick/Makefile')
| -rw-r--r-- | drivers/input/joystick/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile index f3a8cbe2abb6..92dc0de9dfed 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | obj-$(CONFIG_JOYSTICK_A3D) += a3d.o | 7 | obj-$(CONFIG_JOYSTICK_A3D) += a3d.o |
| 8 | obj-$(CONFIG_JOYSTICK_ADI) += adi.o | 8 | obj-$(CONFIG_JOYSTICK_ADI) += adi.o |
| 9 | obj-$(CONFIG_JOYSTICK_AMIGA) += amijoy.o | 9 | obj-$(CONFIG_JOYSTICK_AMIGA) += amijoy.o |
| 10 | obj-$(CONFIG_JOYSTICK_AS5011) += as5011.o | ||
| 10 | obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o | 11 | obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o |
| 11 | obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o | 12 | obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o |
| 12 | obj-$(CONFIG_JOYSTICK_DB9) += db9.o | 13 | obj-$(CONFIG_JOYSTICK_DB9) += db9.o |