Re: [PATCH] HID: hid-steelseries fix led class build issue

[David Rientjes]

On Thu, 2 May 2013, Randy Dunlap wrote:

> > ---
> >  drivers/hid/hid-steelseries.c | 9 ++++++---
> >  1 file changed, 6 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c
> > index 2ed995c..dbd5e2e 100644
> > --- a/drivers/hid/hid-steelseries.c
> > +++ b/drivers/hid/hid-steelseries.c
> > @@ -19,7 +19,8 @@
> >  #include "usbhid/usbhid.h"
> >  #include "hid-ids.h"
> >  
> > -#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
> > +#if defined(CONFIG_LEDS_CLASS) || \
> > +    (defined(CONFIG_LEDS_CLASS_MODULE) && defined(CONFIG_HID_STEELSERIES_MODULE))
> >  #define SRWS1_NUMBER_LEDS 15
> >  struct steelseries_srws1_data {
> >  	__u16 led_state;

While we're working on getting a signed-off-by line, the clean way of 
handling this is

#if IS_BUILTIN(CONFIG_LEDS_CLASS) || \
    (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/