Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219980
b: refs/heads/master
c: 316604b
h: refs/heads/master
v: v3
  • Loading branch information
Andres Salomon authored and Greg Kroah-Hartman committed Sep 30, 2010
1 parent 7f16340 commit 339356a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eecb3e4e5d9d83ebe1bef222a707eb7618498b67
refs/heads/master: 316604bef6874bbd2a946fb39a7555b068c44c08
4 changes: 2 additions & 2 deletions trunk/drivers/staging/olpc_dcon/olpc_dcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 339356a

Please sign in to comment.