From ffcf0fcae148ed7bef129bbd5a199f1bf0214050 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Sun, 6 Feb 2011 15:28:53 -0800 Subject: [PATCH] --- yaml --- r: 235889 b: refs/heads/master c: 56463de05a56b80b43d21a442cf2a6e0037762e8 h: refs/heads/master i: 235887: b2ee6efeee99c74f3b8b09299af60ce2cc245929 v: v3 --- [refs] | 2 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e6e1807864a5..e7dbab0d93b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bada46e5ab10b09b0f86e8b8ede009e759a16adf +refs/heads/master: 56463de05a56b80b43d21a442cf2a6e0037762e8 diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c index 5d85d779952d..eec10e78faba 100644 --- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c @@ -872,7 +872,7 @@ static irqreturn_t dcon_interrupt(int irq, void *id) return IRQ_HANDLED; } -static struct i2c_device_id dcon_idtable[] = { +static const struct i2c_device_id dcon_idtable[] = { { "olpc_dcon", 0 }, { } }; @@ -901,8 +901,7 @@ static int __init olpc_dcon_init(void) { pdata = &dcon_pdata_xo_1; - i2c_add_driver(&dcon_driver); - return 0; + return i2c_add_driver(&dcon_driver); } static void __exit olpc_dcon_exit(void)