[lkml]   [2011]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the sound tree with the mips tree
    Hi Takashi,

    Today's linux-next merge of the sound tree got a conflict in
    sound/mips/Kconfig between commit 9d7dec27ace1 ("MIPS: Alchemy: remove
    all CONFIG_SOC_AU1??? defines") from the mips tree and commit
    7137c6bcb7ff ("ALSA: deprecate MIPS AU1X00 AC97 driver") from the sound

    Just context changes. I fixed it up (see below) anc can carry the fix
    as necessary.
    Stephen Rothwell

    diff --cc sound/mips/Kconfig
    index 0a0d501,77dd0a1..0000000
    --- a/sound/mips/Kconfig
    +++ b/sound/mips/Kconfig
    @@@ -23,8 -23,8 +23,8 @@@ config SND_SGI_HAL

    config SND_AU1X00
    - tristate "Au1x00 AC97 Port Driver"
    + tristate "Au1x00 AC97 Port Driver (DEPRECATED)"
    - depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500
    + depends on MIPS_ALCHEMY
    select SND_PCM
    select SND_AC97_CODEC

     \ /
      Last update: 2011-09-19 07:31    [W:0.019 / U:25.628 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site