lkml.org 
[lkml]   [2002]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [2.5 patch] remove 2.4 compatibility code from irda/vlsi_ir.h
    On Sun, 20 Oct 2002, Adrian Bunk wrote:

    Hi Adrian,

    > I got the following compile error in 2.5.44:
    >
    > <-- snip -->
    >
    > ...
    > gcc -Wp,-MD,drivers/net/irda/.vlsi_ir.o.d -D__KERNEL__ -Iinclude -Wall
    > -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing
    > -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6
    > -Iarch/i386/mach-generic -nostdinc -iwithprefix include -DKBUILD_BASENAME=vlsi_ir -c -o
    > drivers/net/irda/vlsi_ir.o drivers/net/irda/vlsi_ir.c
    > In file included from drivers/net/irda/vlsi_ir.c:53:
    > include/net/irda/vlsi_ir.h:30: parse error
    > make[3]: *** [drivers/net/irda/vlsi_ir.o] Error 1

    Thanks for doing these tests. Unfortunately I've never seen this problem
    before. Might be it's because the whole linux-irda system is assumed to be
    build as module and I've almost never tried compiling it into the kernel.

    Anyway, of course I agree with you the stuff must not break compiling.
    It looks like you are right, there's a linux/version.h missing in the
    includes. Does this solve the issue for you (it does for me)?

    > vlsi_ir.h in 2.4 and 2.5 differ significantly, and I therefore suggest the
    > following patch to remove the compatibility stuff that caused this problem
    > (IMHO a better solution than an #include <linux/version.h>):

    The 2.5/2.4 differences are only temporarily there and due to the usual
    approach to apply new stuff to 2.5 first before moving into 2.4. The
    current 2.5 code should go into 2.4 rather soon and there will be further
    changes along this path. So the compatibility defines are there for a good
    reason and the very few differences between 2.4 and 2.5 (wrt. this
    driver) do not justify the increased effort of having two versions.

    > -#define pci_dma_prep_single(dev, addr, size, direction) /* nothing */

    If this gets removed I can assure you the driver won't compile ;-)

    Please apply the following fix.

    Thanks
    Martin

    -------------------------------------

    --- linux-2.5.44/drivers/net/irda/vlsi_ir.c Sat Oct 12 13:51:07 2002
    +++ v2.5.44-md-ob/drivers/net/irda/vlsi_ir.c Mon Oct 21 19:23:53 2002
    @@ -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>


    -
    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:30    [W:0.050 / U:60.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site