From ef443963722945a3135dae74e28df7b2ec54c801 Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Fri, 30 Sep 2011 10:05:44 +0100
Subject: [PATCH] --- yaml --- r: 268601 b: refs/heads/master c:
 31bf47d518b27291b23728279a695a1f9fd56ce1 h: refs/heads/master i:   268599:
 6c4945eaac152f8c2b4a6f74f7fc5fd42235e6fd v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/iio/adc/ad7887_core.c | 26 ++++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 84d58ad76176..0a67e422ad7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f0676a874df0585f8b06d09d0e0f0ff55078992
+refs/heads/master: 31bf47d518b27291b23728279a695a1f9fd56ce1
diff --git a/trunk/drivers/staging/iio/adc/ad7887_core.c b/trunk/drivers/staging/iio/adc/ad7887_core.c
index 71af6cba7634..37e6cc9e5cb1 100644
--- a/trunk/drivers/staging/iio/adc/ad7887_core.c
+++ b/trunk/drivers/staging/iio/adc/ad7887_core.c
@@ -71,14 +71,24 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
 	 * More devices added in future
 	 */
 	[ID_AD7887] = {
-		.channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
-				       (1 << IIO_CHAN_INFO_SCALE_SHARED),
-				       1, 1, IIO_ST('u', 12, 16, 0), 0),
-
-		.channel[1] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-				       (1 << IIO_CHAN_INFO_SCALE_SHARED),
-				       0, 0, IIO_ST('u', 12, 16, 0), 0),
-
+		.channel[0] = {
+			.type = IIO_VOLTAGE,
+			.indexed = 1,
+			.channel = 1,
+			.info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+			.address = 1,
+			.scan_index = 1,
+			.scan_type = IIO_ST('u', 12, 16, 0),
+		},
+		.channel[1] = {
+			.type = IIO_VOLTAGE,
+			.indexed = 1,
+			.channel = 0,
+			.info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+			.address = 0,
+			.scan_index = 0,
+			.scan_type = IIO_ST('u', 12, 16, 0),
+		},
 		.channel[2] = IIO_CHAN_SOFT_TIMESTAMP(2),
 		.int_vref_mv = 2500,
 	},