From d3a6042e450bf385cc56bc86e6e93a9a72fe6e92 Mon Sep 17 00:00:00 2001
From: Jens Taprogge <jens.taprogge@taprogge.org>
Date: Tue, 4 Sep 2012 17:01:17 +0200
Subject: [PATCH] --- yaml --- r: 324799 b: refs/heads/master c:
 e80111354ac95cd0453e12caf9044938b7a78137 h: refs/heads/master i:   324797:
 6f4797d99fe36ba817e5f59358a23ed2a9dd3345   324795:
 651661a7285cf06b7c5dcc9c04919360ec08fdfa   324791:
 66cd8f579e7d199ee9cd006a876551df82185ca3   324783:
 778b77ae52845339de137a9a243ebeb267f5f1de   324767:
 67b35ffc7a8dc4375e91c21247971b63a50e26e7   324735:
 970dc653be2a18c15b35d044d8dd930d16275c64 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/ipack/devices/ipoctal.c | 8 +++++---
 trunk/drivers/staging/ipack/ipack.h           | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 46ee7d6c90d0..5650614f7c83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7db5e3cb91efbc8a0803dfdcc3a0c9cb43217df4
+refs/heads/master: e80111354ac95cd0453e12caf9044938b7a78137
diff --git a/trunk/drivers/staging/ipack/devices/ipoctal.c b/trunk/drivers/staging/ipack/devices/ipoctal.c
index ed088649965d..7e1e6f70560d 100644
--- a/trunk/drivers/staging/ipack/devices/ipoctal.c
+++ b/trunk/drivers/staging/ipack/devices/ipoctal.c
@@ -28,7 +28,6 @@
 #define IP_OCTAL_ID_SPACE_VECTOR    0x41
 #define IP_OCTAL_NB_BLOCKS          4
 
-static struct ipack_driver driver;
 static const struct tty_operations ipoctal_fops;
 
 struct ipoctal {
@@ -846,15 +845,18 @@ static void ipoctal_remove(struct ipack_device *device)
 	}
 }
 
-static struct ipack_driver_ops ipoctal_drv_ops = {
+static const struct ipack_driver_ops ipoctal_drv_ops = {
 	.match = ipoctal_match,
 	.probe = ipoctal_probe,
 	.remove = ipoctal_remove,
 };
 
+static struct ipack_driver driver = {
+	.ops      = &ipoctal_drv_ops,
+};
+
 static int __init ipoctal_init(void)
 {
-	driver.ops = &ipoctal_drv_ops;
 	return ipack_driver_register(&driver, THIS_MODULE, KBUILD_MODNAME);
 }
 
diff --git a/trunk/drivers/staging/ipack/ipack.h b/trunk/drivers/staging/ipack/ipack.h
index a3cd55982527..e6e38e7dd9f1 100644
--- a/trunk/drivers/staging/ipack/ipack.h
+++ b/trunk/drivers/staging/ipack/ipack.h
@@ -104,7 +104,7 @@ struct ipack_driver_ops {
 struct ipack_driver {
 	struct device_driver driver;
 	const struct ipack_device_id *id_table;
-	struct ipack_driver_ops *ops;
+	const struct ipack_driver_ops *ops;
 };
 
 /**