From b051d43227efe06aaa3266ff5d3e7a8956e1d34f Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 12 Jul 2010 21:16:04 -0700
Subject: [PATCH] --- yaml --- r: 201136 b: refs/heads/master c:
 33cfe65a786cf3d048688b932f41df937282a7bb h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/sbus/char/openprom.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6901e4f00e77..f6481c5c63bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5fa3cb9b790db1c401f4b506d7fcc503771af0d
+refs/heads/master: 33cfe65a786cf3d048688b932f41df937282a7bb
diff --git a/trunk/drivers/sbus/char/openprom.c b/trunk/drivers/sbus/char/openprom.c
index d53e62ab09da..aacbe14e2e7a 100644
--- a/trunk/drivers/sbus/char/openprom.c
+++ b/trunk/drivers/sbus/char/openprom.c
@@ -554,7 +554,7 @@ static int opiocgetnext(unsigned int cmd, void __user *argp)
 static int openprom_bsd_ioctl(struct file * file,
 			      unsigned int cmd, unsigned long arg)
 {
-	DATA *data = (DATA *) file->private_data;
+	DATA *data = file->private_data;
 	void __user *argp = (void __user *)arg;
 	int err;
 
@@ -601,7 +601,7 @@ static int openprom_bsd_ioctl(struct file * file,
 static long openprom_ioctl(struct file * file,
 			   unsigned int cmd, unsigned long arg)
 {
-	DATA *data = (DATA *) file->private_data;
+	DATA *data = file->private_data;
 
 	switch (cmd) {
 	case OPROMGETOPT: