---

yaml --- r: 268602 b: refs/heads/master c: 85da505 h: refs/heads/master v: v3
git-mirror · Oct 3, 2011 · f0e1fd9 · f0e1fd9
1 parent ef44396
commit f0e1fd9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31bf47d518b27291b23728279a695a1f9fd56ce1
+refs/heads/master: 85da50596db89356524974d78bec0e32952521a8
diff --git a/trunk/drivers/staging/iio/imu/Kconfig b/trunk/drivers/staging/iio/imu/Kconfig
@@ -9,9 +9,9 @@ config ADIS16400
 	select IIO_SW_RING if IIO_BUFFER
 	select IIO_TRIGGER if IIO_BUFFER
 	help
-	  Say yes here to build support for Analog Devices adis16300, adis16350,
-	  adis16354, adis16355, adis16360, adis16362, adis16364, adis16365,
-	  adis16400 and adis16405 triaxial inertial sensors (adis16400 series
-	  also have magnetometers).
+	  Say yes here to build support for Analog Devices adis16300, adis16344,
+	  adis16350, adis16354, adis16355, adis16360, adis16362, adis16364,
+	  adis16365, adis16400 and adis16405 triaxial inertial sensors
+	  (adis16400 series also have magnetometers).
 
 endmenu
diff --git a/trunk/drivers/staging/iio/imu/adis16400_core.c b/trunk/drivers/staging/iio/imu/adis16400_core.c
@@ -33,7 +33,7 @@
 
 enum adis16400_chip_variant {
 	ADIS16300,
-	ADIS16344,
+	ADIS16334,
 	ADIS16350,
 	ADIS16360,
 	ADIS16362,
@@ -852,7 +852,7 @@ static struct iio_chan_spec adis16300_channels[] = {
 	IIO_CHAN_SOFT_TIMESTAMP(14)
 };
 
-static const struct iio_chan_spec adis16344_channels[] = {
+static const struct iio_chan_spec adis16334_channels[] = {
 	{
 		.type = IIO_GYRO,
 		.modified = 1,
@@ -944,9 +944,9 @@ static struct adis16400_chip_info adis16400_chips[] = {
 		(1 << ADIS16300_SCAN_INCLI_X) | (1 << ADIS16300_SCAN_INCLI_Y) |
 		(1 << 14),
 	},
-	[ADIS16344] = {
-		.channels = adis16344_channels,
-		.num_channels = ARRAY_SIZE(adis16344_channels),
+	[ADIS16334] = {
+		.channels = adis16334_channels,
+		.num_channels = ARRAY_SIZE(adis16334_channels),
 		.gyro_scale_micro = 873,
 		.accel_scale_micro = 981,
 		.default_scan_mask = (1 << ADIS16400_SCAN_GYRO_X) |
@@ -1105,7 +1105,7 @@ static int adis16400_remove(struct spi_device *spi)
 
 static const struct spi_device_id adis16400_id[] = {
 	{"adis16300", ADIS16300},
-	{"adis16344", ADIS16344},
+	{"adis16334", ADIS16334},
 	{"adis16350", ADIS16350},
 	{"adis16354", ADIS16350},
 	{"adis16355", ADIS16350},