The patch titled
     nvidiafb: Correctly assign the i2c class with the port reversal
has been removed from the -mm tree.  Its filename was
     nvidiafb-correctly-assign-the-i2c-class-with-the-port-reversal.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: nvidiafb: Correctly assign the i2c class with the port reversal
From: "Antonino A. Daplas" <[EMAIL PROTECTED]>

If the i2c ports are to be reversed, I2C_CLASS_HWMON assignment must also be
reversed.

Signed-off-by: Antonino Daplas <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/video/nvidia/nv_i2c.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff -puN 
drivers/video/nvidia/nv_i2c.c~nvidiafb-correctly-assign-the-i2c-class-with-the-port-reversal
 drivers/video/nvidia/nv_i2c.c
--- 
a/drivers/video/nvidia/nv_i2c.c~nvidiafb-correctly-assign-the-i2c-class-with-the-port-reversal
+++ a/drivers/video/nvidia/nv_i2c.c
@@ -126,10 +126,12 @@ void nvidia_create_i2c_busses(struct nvi
        par->chan[2].par = par;
 
        par->chan[0].ddc_base = (par->reverse_i2c) ? 0x36 : 0x3e;
-       nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0", 0);
+       nvidia_setup_i2c_bus(&par->chan[0], "nvidia #0",
+                            (par->reverse_i2c) ? I2C_CLASS_HWMON : 0);
 
        par->chan[1].ddc_base = (par->reverse_i2c) ? 0x3e : 0x36;
-       nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1", I2C_CLASS_HWMON);
+       nvidia_setup_i2c_bus(&par->chan[1], "nvidia #1",
+                            (par->reverse_i2c) ? 0 : I2C_CLASS_HWMON);
 
        par->chan[2].ddc_base = 0x50;
        nvidia_setup_i2c_bus(&par->chan[2], "nvidia #2", 0);
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
fbcon-delay-the-start-of-the-cursor-timer-until-a-con_switch.patch
cyber2000fb-checkpatch-fixes.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to