From 1a9c26dcb375c96888f5050ec4a6b37d0bdd5192 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:25:26 -0500
Subject: [PATCH] --- yaml --- r: 338089 b: refs/heads/master c:
 063f9f6a8705c5da3ee46c667a3e6e01eaf31560 h: refs/heads/master i:   338087:
 4940a555cb4e8c8d0946048eefe7dddb26ff4fe6 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/staging/nvec/nvec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5c0d3b25ab1d..6f030f1db756 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46620803c309d2bc10814b903b39d7647057b440
+refs/heads/master: 063f9f6a8705c5da3ee46c667a3e6e01eaf31560
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
index 27881a352340..d8180f0cd1c7 100644
--- a/trunk/drivers/staging/nvec/nvec.c
+++ b/trunk/drivers/staging/nvec/nvec.c
@@ -901,7 +901,7 @@ static int nvec_resume(struct device *dev)
 static const SIMPLE_DEV_PM_OPS(nvec_pm_ops, nvec_suspend, nvec_resume);
 
 /* Match table for of_platform binding */
-static const struct of_device_id nvidia_nvec_of_match[] __devinitconst = {
+static const struct of_device_id nvidia_nvec_of_match[] = {
 	{ .compatible = "nvidia,nvec", },
 	{},
 };