Re: 2.2.15pre13 bttv: CONFIG_VIDEO_MSP3400 still in the sound section

From: Andreas Muck (andi@koala.rhein-neckar.de)
Date: Sat Mar 04 2000 - 10:20:46 EST

  • Next message: Momchil Velikov: "Re: FIle IO Scatter/Gather."

    arjan@fenrus.demon.nl (Arjan van de Ven) writes:

    >The MSP3400 does depend on sound, at least for some combinations (like the
    >one above).

    Yes I've seen that now. But I'd still rather call it a bug in the
    msp3400 code. The obvious fix would be this:

    diff -u --recursive --new-file linux-2.2.15pre13/drivers/char/msp3400.c linux/dr
    ivers/char/msp3400.c
    --- linux-2.2.15pre13/drivers/char/msp3400.c Wed Oct 20 02:14:00 1999
    +++ linux/drivers/char/msp3400.c Sat Mar 4 15:44:52 2000
    @@ -61,7 +61,8 @@
     #include <linux/config.h>
     
     #if LINUX_VERSION_CODE > 0x020140 /* need modular sound driver */
    -# if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
    +# if defined(CONFIG_SOUND) || \
    + (defined(CONFIG_SOUND_MODULE) && defined(CONFIG_VIDEO_MSP3400_MODULE))
     # define REGISTER_MIXER 1
     # endif
     #endif

    >What would be a greater pain: People who buy OSS-commercial have to change
    >their conf.modules to use OSS-commercial, or people without OSS-commercial
    >have a working kernel without all kinds of explicit rules and hidden
    >dependencies.

    It's not only changing conf.modules, that wouldn't hurt anybody. The
    problem is that you can't load OSS on top of soundcore. But that seems
    like an OSS problem now.

    Anyway, I thought: why not make everybody happy and make it work
    either way? The change above would fix the dependencies and allow you
    to use the msp3400 code without sound support again. No good? :)

    Btw, if msp3400 is going to remain in the sound section for good, then
    the ifdefs above are useless and could be removed completely.

    Andi

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.rutgers.edu
    Please read the FAQ at http://www.tux.org/lkml/



    This archive was generated by hypermail 2b29 : Sat Mar 04 2000 - 10:47:02 EST