lkml.org 
[lkml]   [2005]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] bttv fix [was: 2.6.12-mm1]

    On 06.20, Andrew Morton wrote:
    >
    > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12/2.6.12-mm1/
    >
    >
    > - Someone broke /proc/device-tree on ppc64. It's being looked into.
    >
    > - Nothing particularly special here - various fixes and updates.
    >

    And a small breakage ;).
    struct bttv defined after usage. Fix below:

    --- linux-2.6.12-jam1/drivers/media/video/bttvp.h.orig 2005-06-20 10:00:24.000000000 +0200
    +++ linux-2.6.12-jam1/drivers/media/video/bttvp.h 2005-06-20 10:00:59.000000000 +0200
    @@ -226,11 +226,6 @@
    #define dprintk if (bttv_debug >= 1) printk
    #define d2printk if (bttv_debug >= 2) printk

    -/* our devices */
    -#define BTTV_MAX 16
    -extern unsigned int bttv_num;
    -extern struct bttv bttvs[BTTV_MAX];
    -
    #define BTTV_MAX_FBUF 0x208000
    #define VBIBUF_SIZE (2048*VBI_MAXLINES*2)
    #define BTTV_TIMEOUT (HZ/2) /* 0.5 seconds */
    @@ -377,6 +372,11 @@
    struct bttv_fh init;
    };

    +/* our devices */
    +#define BTTV_MAX 16
    +extern unsigned int bttv_num;
    +extern struct bttv bttvs[BTTV_MAX];
    +
    /* private ioctls */
    #define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
    #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int)

    --
    J.A. Magallon <jamagallon()able!es> \ Software is like sex:
    werewolf!able!es \ It's better when it's free
    Mandriva Linux release 2006.0 (Cooker) for i586
    Linux 2.6.12-jam1 (gcc 4.0.1 (4.0.1-0.2mdk for Mandriva Linux release 2006.0))


    -
    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-06-20 13:44    [W:0.044 / U:30.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site