diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 18:10:45 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 18:10:45 +0200 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /drivers/gpu/drm/nouveau/nouveau_temp.c | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_temp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_temp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c index 7ecc4adc1e4..8d9968e1cba 100644 --- a/drivers/gpu/drm/nouveau/nouveau_temp.c +++ b/drivers/gpu/drm/nouveau/nouveau_temp.c @@ -265,8 +265,8 @@ nouveau_temp_probe_i2c(struct drm_device *dev) struct i2c_board_info info[] = { { I2C_BOARD_INFO("w83l785ts", 0x2d) }, { I2C_BOARD_INFO("w83781d", 0x2d) }, - { I2C_BOARD_INFO("f75375", 0x2e) }, { I2C_BOARD_INFO("adt7473", 0x2e) }, + { I2C_BOARD_INFO("f75375", 0x2e) }, { I2C_BOARD_INFO("lm99", 0x4c) }, { } }; |