diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
| commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
| tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /drivers/input/serio/olpc_apsp.c | |
| parent | d49cb7aeebb974713f9f7ab2991352d3050b095b (diff) | |
| parent | 68807a0c2015cb40df4869e16651f0ce5cc14d52 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'drivers/input/serio/olpc_apsp.c')
| -rw-r--r-- | drivers/input/serio/olpc_apsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c index 5d2fe7ece7ca..d906f3ebc8c8 100644 --- a/drivers/input/serio/olpc_apsp.c +++ b/drivers/input/serio/olpc_apsp.c | |||
| @@ -262,7 +262,7 @@ static int olpc_apsp_remove(struct platform_device *pdev) | |||
| 262 | return 0; | 262 | return 0; |
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | static struct of_device_id olpc_apsp_dt_ids[] = { | 265 | static const struct of_device_id olpc_apsp_dt_ids[] = { |
| 266 | { .compatible = "olpc,ap-sp", }, | 266 | { .compatible = "olpc,ap-sp", }, |
| 267 | {} | 267 | {} |
| 268 | }; | 268 | }; |