diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 04:41:07 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 04:41:07 -0400 |
| commit | 423b742bec02b6c8d4e060517ce05b4cd3fd91c1 (patch) | |
| tree | 3d4e090581970646d0afc92166bd490cc4977021 /drivers/gpu/drm/nouveau/nouveau_i2c.h | |
| parent | be944f1e79063e4f27b46c74f10c86b2387afa9f (diff) | |
| parent | f5520363532690f56e12126029864d9383d5203f (diff) | |
Merge branch 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux into next/boards
* 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux:
ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree
kirkwood: Add iconnect support
orion/kirkwood: create a generic function for gpio led blinking
kirkwood/orion: fix orion_gpio_set_blink
ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt
kirkwood: Allow nand to be configured via. devicetree
mtd: Add orion_nand devicetree bindings
ARM: kirkwood: Basic support for DNS-320 and DNS-325
Includes an update to v3.4-rc7
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_i2c.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_i2c.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h index 4d2e4e9031be..1d083893a4d7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_i2c.h +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | struct nouveau_i2c_chan { | 34 | struct nouveau_i2c_chan { |
| 35 | struct i2c_adapter adapter; | 35 | struct i2c_adapter adapter; |
| 36 | struct drm_device *dev; | 36 | struct drm_device *dev; |
| 37 | struct i2c_algo_bit_data bit; | ||
| 37 | struct list_head head; | 38 | struct list_head head; |
| 38 | u8 index; | 39 | u8 index; |
| 39 | u8 type; | 40 | u8 type; |