lkml.org 
[lkml]   [2002]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    Date
    From
    SubjectRe: Linux v2.5.50
    On Wed, Nov 27, 2002 at 03:07:38PM -0800, Linus Torvalds wrote:

    >...
    > Summary of changes from v2.5.49 to v2.5.50
    > ============================================

    2.5.50 includes two changes that have the following in common:
    - Alan forwarded them to you
    - they were originally sent by me
    - they are buggy

    Below are explanations and fixes.

    >...
    > Alan Cox <alan@lxorguk.ukuu.org.uk>:
    >...
    > o remove junk from vlsi_ir
    >...

    1. the maintainer prefers to leave the LINUX_VERSION_CODE und to add an
    #include <linux/version.h> to make it easier to have the same driver
    in both 2.4 and 2.5
    2. my removal of pci_dma_prep_single was complete nonsense (no, it's not
    part of the comment...)

    The following patch fixes it:

    --- linux-2.5.50/include/net/irda/vlsi_ir.h.old 2002-11-30 20:50:10.000000000 +0100
    +++ linux-2.5.50/include/net/irda/vlsi_ir.h 2002-11-30 20:50:20.000000000 +0100
    @@ -27,6 +27,26 @@
    #ifndef IRDA_VLSI_FIR_H
    #define IRDA_VLSI_FIR_H

    +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,4)
    +#ifdef CONFIG_PROC_FS
    +/* PDE() introduced in 2.5.4 */
    +#define PDE(inode) ((inode)->u.generic_ip)
    +#endif
    +#endif
    +
    +/*
    + * #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,xx)
    + *
    + * missing pci-dma api call to give streaming dma buffer back to hw
    + * patch floating on lkml - probably present in 2.5.26 or later
    + * otherwise defining it as noop is ok, since the vlsi-ir is only
    + * used on two oldish x86-based notebooks which are cache-coherent
    + */
    +#define pci_dma_prep_single(dev, addr, size, direction) /* nothing */
    +/*
    + * #endif
    + */
    +
    /* ================================================================ */

    /* non-standard PCI registers */
    --- linux-2.5.50/drivers/net/irda/vlsi_ir.c.old 2002-11-30 20:51:12.000000000 +0100
    +++ linux-2.5.50/drivers/net/irda/vlsi_ir.c 2002-11-30 20:51:39.000000000 +0100
    @@ -44,6 +44,7 @@
    #include <linux/time.h>
    #include <linux/proc_fs.h>
    #include <linux/smp_lock.h>
    +#include <linux/version.h>
    #include <asm/uaccess.h>

    #include <net/irda/irda.h>

    > o fix sound kconfig file locations
    >...

    The changed file locations are OK, wrond is my addition of the question
    strings to MSNDCLAS_HAVE_BOOT are MSNDPIN_HAVE_BOOT. As Roman Zippel
    told me in another thread they were define_bool in the old kconfig.

    The following patch corrects this:

    --- linux-2.5.50/sound/oss/Kconfig.old 2002-11-30 20:47:01.000000000 +0100
    +++ linux-2.5.50/sound/oss/Kconfig 2002-11-30 20:47:25.000000000 +0100
    @@ -293,7 +293,7 @@
    depends on SOUND_PRIME && SOUND_MSNDCLAS=y

    config MSNDCLAS_HAVE_BOOT
    - bool "Have MSNDINIT.BIN firmware file"
    + bool
    depends on SOUND_MSNDCLAS=y
    default y

    @@ -355,7 +355,7 @@
    depends on SOUND_PRIME && SOUND_MSNDPIN=y

    config MSNDPIN_HAVE_BOOT
    - bool "Have PNDSPINI.BIN firmware file"
    + bool
    depends on SOUND_MSNDPIN=y
    default y



    Sorry
    Adrian

    --

    "Is there not promise of rain?" Ling Tan asked suddenly out
    of the darkness. There had been need of rain for many days.
    "Only a promise," Lao Er said.
    Pearl S. Buck - Dragon Seed

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

    \
     
     \ /
      Last update: 2005-03-22 13:31    [W:2.733 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site