On Fri, Jan 21, 2011 at 12:30:13PM +0300, Nikolai Kondrashov wrote: > Split DragonRise Inc. HID gamepad driver (hid-drff.c) into a general > (hid-dr.[hc]) and a force feedback part (hid-drff.c). > > Signed-off-by: Nikolai Kondrashov <spbnick@xxxxxxxxx> > --- > drivers/hid/Makefile | 7 ++++- > drivers/hid/hid-dr.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/hid/hid-dr.h | 13 +++++++++ > drivers/hid/hid-drff.c | 63 +----------------------------------------- > 4 files changed, 92 insertions(+), 62 deletions(-) > create mode 100644 drivers/hid/hid-dr.c > create mode 100644 drivers/hid/hid-dr.h > > diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile > index 6efc2a0..ea58795 100644 > --- a/drivers/hid/Makefile > +++ b/drivers/hid/Makefile > @@ -25,6 +25,11 @@ ifdef CONFIG_LOGIWII_FF > hid-logitech-y += hid-lg4ff.o > endif > > +hid-dragonrise-objs := hid-dr.o > +ifdef CONFIG_DRAGONRISE_FF > + hid-dragonrise-objs += hid-drff.o > +endif If you want to keep the 2 source files then I think you should write this as: hid-dragonrise-y := hid-dr.o hid-dragonrise-$(CONFIG_DRAGONRISE_FF) += hid-drff.o Or maybe fold them into one? -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
