diff options
author | Paul Mackerras <paulus@samba.org> | 2007-05-08 03:37:51 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 03:37:51 (GMT) |
commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /include/linux/i2c-id.h | |
parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
download | linux-fsl-qoriq-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/i2c-id.h')
-rw-r--r-- | include/linux/i2c-id.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 9c21dc7..0e8da68 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h @@ -258,8 +258,9 @@ /* --- MCP107 adapter */ #define I2C_HW_MPC107 0x0d0000 -/* --- Marvell mv64xxx i2c adapter */ +/* --- Embedded adapters */ #define I2C_HW_MV64XXX 0x190000 +#define I2C_HW_BLACKFIN 0x190001 /* ADI Blackfin I2C TWI driver */ /* --- Miscellaneous adapters */ #define I2C_HW_SAA7146 0x060000 /* SAA7146 video decoder bus */ |