Changeset 3448

Show
Ignore:
Timestamp:
02/10/00 16:28:23 (13 years ago)
Author:
frodo
Message:

Sync with kernel 2.3.43-pre8

* Copied I2C_DRIVERID_SAA5249 from kernel tree
* Now using tags within large structs, instead of ordering by hand

Kernel 2.3.43-pre8 is completely synchronised with our tree now.

Location:
i2c/trunk/kernel
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • i2c/trunk/kernel/i2c-core.c

    r3444 r3448  
    9999   implementation of the read hook */ 
    100100static struct file_operations i2cproc_operations = { 
    101         NULL, 
    102         i2cproc_bus_read, 
     101        read:           i2cproc_bus_read, 
    103102}; 
    104103 

  • i2c/trunk/kernel/i2c-dev.c

    r3440 r3448  
    7575 
    7676static struct file_operations i2cdev_fops = { 
    77         i2cdev_lseek, 
    78         i2cdev_read, 
    79         i2cdev_write, 
    80         NULL,                   /* i2cdev_readdir       */ 
    81         NULL,                   /* i2cdev_select        */ 
    82         i2cdev_ioctl, 
    83         NULL,                   /* i2cdev_mmap          */ 
    84         i2cdev_open, 
    85         NULL,                   /* i2cdev_flush         */ 
    86         i2cdev_release, 
     77        llseek:         i2cdev_lseek, 
     78        read:           i2cdev_read, 
     79        write:          i2cdev_write, 
     80        ioctl:          i2cdev_ioctl, 
     81        open:           i2cdev_open, 
     82        release:        i2cdev_release, 
    8783}; 
    8884 

  • i2c/trunk/kernel/i2c-id.h

    r3447 r3448  
    6868#define I2C_DRIVERID_SAA7110    22      /*                              */ 
    6969#define I2C_DRIVERID_MGATVO     23      /* Matrox TVOut                 */ 
     70#define I2C_DRIVERID_SAA5249    24      /* Matrox TVOut                 */ 
    7071 
    7172#define I2C_DRIVERID_EXP0       0xF0    /* experimental use id's        */