input: fixup X86_MRST selects
in [Kernel]
|
Prev: PCI: hotplug/cpqphp, fix NULL dereference
Next: [PATCH 1/2 -next] of_device.h: provide struct of_device even when not enabled
From: Dmitry Torokhov on 9 Jun 2010 18:50 On Wednesday, June 09, 2010 03:29:21 pm Randy Dunlap wrote: > +++ linux-next-20100609/drivers/input/keyboard/Kconfig > @@ -70,9 +70,10 @@ config KEYBOARD_ATARI > > config KEYBOARD_ATKBD > tristate "AT keyboard" if EMBEDDED || !X86 > + depends on !X86 || (X86 && !X86_MRST) Should it be simply 'depends on !X86_MRST' and then we could kill '!X86_MRST' conditionals in selects? > default y > select SERIO > - select SERIO_LIBPS2 > + select SERIO_LIBPS2 if !X86_MRST > select SERIO_I8042 if X86 && !X86_MRST > select SERIO_GSCPS2 if GSC > help Thanks. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Randy Dunlap on 9 Jun 2010 18:50 On 06/09/10 15:40, Dmitry Torokhov wrote: > On Wednesday, June 09, 2010 03:29:21 pm Randy Dunlap wrote: >> +++ linux-next-20100609/drivers/input/keyboard/Kconfig >> @@ -70,9 +70,10 @@ config KEYBOARD_ATARI >> >> config KEYBOARD_ATKBD >> tristate "AT keyboard" if EMBEDDED || !X86 >> + depends on !X86 || (X86 && !X86_MRST) > > Should it be simply 'depends on !X86_MRST' and then we could kill > '!X86_MRST' conditionals in selects? Duh, that sounds good, yes. > >> default y >> select SERIO >> - select SERIO_LIBPS2 >> + select SERIO_LIBPS2 if !X86_MRST >> select SERIO_I8042 if X86 && !X86_MRST >> select SERIO_GSCPS2 if GSC >> help > > Thanks. > -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Randy Dunlap on 15 Jun 2010 11:20
On 06/10/10 12:04, Dmitry Torokhov wrote: > On Wednesday, June 09, 2010 03:42:08 pm Randy Dunlap wrote: >> On 06/09/10 15:40, Dmitry Torokhov wrote: >>> On Wednesday, June 09, 2010 03:29:21 pm Randy Dunlap wrote: >>>> +++ linux-next-20100609/drivers/input/keyboard/Kconfig >>>> @@ -70,9 +70,10 @@ config KEYBOARD_ATARI >>>> >>>> config KEYBOARD_ATKBD >>>> tristate "AT keyboard" if EMBEDDED || !X86 >>>> + depends on !X86 || (X86 && !X86_MRST) >>> >>> Should it be simply 'depends on !X86_MRST' and then we could kill >>> '!X86_MRST' conditionals in selects? >> >> Duh, that sounds good, yes. > > Actually, I do not think this is a correct approach. While Moorestown does > not have i8042 theoretically it is possible to add AT-style keyboard by > other means (however unlikely it is) so we should not be disabling it. > > We should, however, disallow i8042 from being selected. Could you please > tell me if the patch below works for you? Yes, that's good. Thanks. -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |