diff --git a/[refs] b/[refs]
index 062f114ff117..54ab9754c7f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eecb3e4e5d9d83ebe1bef222a707eb7618498b67
+refs/heads/master: 316604bef6874bbd2a946fb39a7555b068c44c08
diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
index 688cf0f69524..02a4502961dd 100644
--- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -201,7 +201,7 @@ static int dcon_bus_stabilize(struct i2c_client *client, int is_powered_down)
 	if (x < 0) {
 		printk(KERN_ERR "olpc-dcon:  unable to stabilize dcon's "
 				"smbus, reasserting power and praying.\n");
-		BUG_ON(olpc_board_at_least(olpc_board(BOARD_XO_1_C2)));
+		BUG_ON(olpc_board_at_least(olpc_board(0xc2)));
 		x = 0;
 		olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0);
 		msleep(100);
@@ -295,7 +295,7 @@ static void dcon_sleep(int state)
 	if (state == dcon_sleep_val)
 		return;
 
-	if (!olpc_board_at_least(olpc_board(BOARD_XO_1_C2)))
+	if (!olpc_board_at_least(olpc_board(0xc2)))
 		return;
 
 	if (state == DCON_SLEEP) {