From 800c45aabbafdd7083f3d26ab2a12f46f1908c85 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 9 Jan 2013 14:01:00 +0000
Subject: [PATCH] --- yaml --- r: 354215 b: refs/heads/master c:
 c21ab7005140bdc5898907f73a5d73a86ea60a5d h: refs/heads/master i:   354213:
 c1986b4c9cc8033934385b886f49816a97d8e7e2   354211:
 6fcce22add821c4a10db92c12b1e62b171fe9438   354207:
 bcdbc1c0727d565eda60da71788c977acbe21986 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/iio/gyro/Kconfig          | 4 ++--
 trunk/drivers/staging/iio/gyro/adis16080_core.c | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3f3d8bae0dcf..439ed880592a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f45188c40432843825865582ace8d118f9ed407
+refs/heads/master: c21ab7005140bdc5898907f73a5d73a86ea60a5d
diff --git a/trunk/drivers/staging/iio/gyro/Kconfig b/trunk/drivers/staging/iio/gyro/Kconfig
index 87979a0d03a9..a439e0512d5a 100644
--- a/trunk/drivers/staging/iio/gyro/Kconfig
+++ b/trunk/drivers/staging/iio/gyro/Kconfig
@@ -14,8 +14,8 @@ config ADIS16080
 	tristate "Analog Devices ADIS16080/100 Yaw Rate Gyroscope with SPI driver"
 	depends on SPI
 	help
-	  Say yes here to build support for Analog Devices adis16080/100 Yaw Rate
-	  Gyroscope with SPI.
+	  Say yes here to build support for Analog Devices ADIS16080, ADIS16100 Yaw
+	  Rate Gyroscope with SPI.
 
 config ADIS16130
 	tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
diff --git a/trunk/drivers/staging/iio/gyro/adis16080_core.c b/trunk/drivers/staging/iio/gyro/adis16080_core.c
index 41d7350d030f..2eb559cff347 100644
--- a/trunk/drivers/staging/iio/gyro/adis16080_core.c
+++ b/trunk/drivers/staging/iio/gyro/adis16080_core.c
@@ -185,6 +185,13 @@ static int adis16080_remove(struct spi_device *spi)
 	return 0;
 }
 
+static const struct spi_device_id adis16080_ids[] = {
+	{ "adis16080", 0 },
+	{ "adis16100", 0 },
+	{},
+};
+MODULE_DEVICE_TABLE(spi, adis16080_ids);
+
 static struct spi_driver adis16080_driver = {
 	.driver = {
 		.name = "adis16080",
@@ -192,10 +199,10 @@ static struct spi_driver adis16080_driver = {
 	},
 	.probe = adis16080_probe,
 	.remove = adis16080_remove,
+	.id_table = adis16080_ids,
 };
 module_spi_driver(adis16080_driver);
 
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADIS16080/100 Yaw Rate Gyroscope Driver");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:adis16080");