diff --git a/[refs] b/[refs]
index 303fe3da29e9..c9fcb509e90c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb048d558690ba1468e6bb26b82594b4330fb21c
+refs/heads/master: 8a789f8c306b5e3fe6ef71bb5412055075d8c87f
diff --git a/trunk/drivers/staging/gma500/Kconfig b/trunk/drivers/staging/gma500/Kconfig
index 5501eb9b3355..ce8bedaeaac2 100644
--- a/trunk/drivers/staging/gma500/Kconfig
+++ b/trunk/drivers/staging/gma500/Kconfig
@@ -1,6 +1,6 @@
 config DRM_PSB
 	tristate "Intel GMA500 KMS Framebuffer"
-	depends on DRM && PCI
+	depends on DRM && PCI && X86
 	select FB_CFB_COPYAREA
         select FB_CFB_FILLRECT
         select FB_CFB_IMAGEBLIT
diff --git a/trunk/drivers/staging/gma500/mrst_lvds.c b/trunk/drivers/staging/gma500/mrst_lvds.c
index 21b9056ec84a..4a08b74f5ff9 100644
--- a/trunk/drivers/staging/gma500/mrst_lvds.c
+++ b/trunk/drivers/staging/gma500/mrst_lvds.c
@@ -22,6 +22,7 @@
 
 #include <linux/i2c.h>
 #include <drm/drmP.h>
+#include <asm/mrst.h>
 
 #include "psb_intel_bios.h"
 #include "psb_drv.h"
@@ -300,7 +301,15 @@ void mrst_lvds_init(struct drm_device *dev,
 	 * 4) make sure lid is open
 	 *    if closed, act like it's not there for now
 	 */
-	i2c_adap = i2c_get_adapter(2);
+
+	 /* This ifdef can go once the cpu ident stuff is cleaned up in arch */
+#if defined(CONFIG_X86_MRST)
+	if (mrst_identify_cpu())
+        	i2c_adap = i2c_get_adapter(2);
+        else	/* Oaktrail uses I2C 1 */
+#endif        
+        	i2c_adap = i2c_get_adapter(1);
+
 	if (i2c_adap == NULL)
 		printk(KERN_ALERT "No ddc adapter available!\n");
 	/*