From: Andres Salomon Date: Sat, 25 Sep 2010 02:14:09 +0000 (-0700) Subject: staging: olpc_dcon: switch back to using olpc_board(0xXX) X-Git-Tag: firefly_0821_release~7613^2~3583^2~3^2~467 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=316604bef6874bbd2a946fb39a7555b068c44c08;p=firefly-linux-kernel-4.4.55.git staging: olpc_dcon: switch back to using olpc_board(0xXX) ...Rather than macros that don't exist. Necessary for building the driver. Signed-off-by: Andres Salomon Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index 688cf0f69524..02a4502961dd 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c @@ -201,7 +201,7 @@ power_up: 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) {