diff --git a/[refs] b/[refs]
index 8c34bf3ae88a..5543dcfa75d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a65ff76ac8b24df49bbf4acc38918fb52d1033b0
+refs/heads/master: 0404384982b2f71eb00573c8f9da514106aca08c
diff --git a/trunk/drivers/video/riva/rivafb-i2c.c b/trunk/drivers/video/riva/rivafb-i2c.c
index bcb209670a18..76e6ce353c8e 100644
--- a/trunk/drivers/video/riva/rivafb-i2c.c
+++ b/trunk/drivers/video/riva/rivafb-i2c.c
@@ -133,11 +133,11 @@ void __devinit riva_create_i2c_busses(struct riva_par *par)
 	par->chan[1].par	= par;
 	par->chan[2].par        = par;
 
-	par->chan[0].ddc_base = 0x3e;
-	par->chan[1].ddc_base = 0x36;
+	par->chan[0].ddc_base = 0x36;
+	par->chan[1].ddc_base = 0x3e;
 	par->chan[2].ddc_base = 0x50;
-	riva_setup_i2c_bus(&par->chan[0], "BUS1", 0);
-	riva_setup_i2c_bus(&par->chan[1], "BUS2", I2C_CLASS_HWMON);
+	riva_setup_i2c_bus(&par->chan[0], "BUS1", I2C_CLASS_HWMON);
+	riva_setup_i2c_bus(&par->chan[1], "BUS2", 0);
 	riva_setup_i2c_bus(&par->chan[2], "BUS3", 0);
 }