diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2003-09-22 01:36:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2003-09-22 01:36:30 -0700 |
| commit | 6c16fa73032b781288a6c0d29731ba59d2bf1c8e (patch) | |
| tree | cc76e43dd89403059759d10554cb881ae55cc430 /include/linux | |
| parent | 8912ad073fd7d7110a57acbfa0b33d4dad9d1ee1 (diff) | |
| parent | 285dde44ee1755288657a4d776d231f9f3ae514b (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.5
into kroah.com:/home/greg/linux/BK/i2c-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2c-id.h | 2 | ||||
| -rw-r--r-- | include/linux/i2c.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 6f12340e8e24..7dc4abf806c2 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h @@ -100,7 +100,7 @@ #define I2C_DRIVERID_STM41T00 52 /* real time clock */ #define I2C_DRIVERID_UDA1342 53 /* UDA1342 audio codec */ #define I2C_DRIVERID_ADV7170 54 /* video encoder */ - +#define I2C_DRIVERID_RADEON 55 /* I2C bus on Radeon boards */ #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ diff --git a/include/linux/i2c.h b/include/linux/i2c.h index f2dc147bda89..2bfab00071ca 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -146,6 +146,8 @@ struct i2c_driver { extern struct bus_type i2c_bus_type; +#define I2C_NAME_SIZE 50 + /* * i2c_client identifies a single device (i.e. chip) that is connected to an * i2c bus. The behaviour is defined by the routines of the driver. This @@ -166,7 +168,7 @@ struct i2c_client { /* to the client */ struct device dev; /* the device structure */ struct list_head list; - char name[DEVICE_NAME_SIZE]; + char name[I2C_NAME_SIZE]; struct completion released; }; #define to_i2c_client(d) container_of(d, struct i2c_client, dev) @@ -253,7 +255,7 @@ struct i2c_adapter { int nr; struct list_head clients; struct list_head list; - char name[DEVICE_NAME_SIZE]; + char name[I2C_NAME_SIZE]; struct completion dev_released; struct completion class_dev_released; }; |