lkml.org 
[lkml]   [2010]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the input tree with the davinci tree
    Hi Dmitry,

    Today's linux-next merge of the input tree got a conflict in
    drivers/input/keyboard/Kconfig between commit
    34dca1011e05d3965c0f60d51a69643789683877 ("input: add driver for
    tnetv107x on-chip keypad controller") from the davinci tree and commit
    a17f79553f052f04d47689a842118f775f81b7e3 ("Input: add support for OMAP4
    keyboard controller") from the input tree.

    Just overlapping additions. I fixed it up (see below) and can carry the
    fix as necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    diff --cc drivers/input/keyboard/Kconfig
    index df1facb,4f30048..0000000
    --- a/drivers/input/keyboard/Kconfig
    +++ b/drivers/input/keyboard/Kconfig
    @@@ -424,15 -424,15 +424,24 @@@ config KEYBOARD_OMA
    To compile this driver as a module, choose M here: the
    module will be called omap-keypad.

    + config KEYBOARD_OMAP4
    + tristate "TI OMAP4 keypad support"
    + depends on ARCH_OMAP4
    + help
    + Say Y here if you want to use the OMAP4 keypad.
    +
    + To compile this driver as a module, choose M here: the
    + module will be called omap4-keypad.
    +
    +config KEYBOARD_TNETV107X
    + tristate "TI TNETV107X keypad support"
    + depends on ARCH_DAVINCI_TNETV107X
    + help
    + Say Y here if you want to use the TNETV107X keypad.
    +
    + To compile this driver as a module, choose M here: the
    + module will be called tnetv107x-keypad.
    +
    config KEYBOARD_TWL4030
    tristate "TI TWL4030/TWL5030/TPS659x0 keypad support"
    depends on TWL4030_CORE


    \
     
     \ /
      Last update: 2010-09-21 04:49    [W:0.031 / U:30.836 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site