Title: [9648] trunk/drivers/staging/iio/gyro/adis16260_core.c: merge from upstream: staging: iio: adis16260 add id table support
- Revision
- 9648
- Author
- vapier
- Date
- 2011-03-01 15:57:20 -0500 (Tue, 01 Mar 2011)
Log Message
merge from upstream: staging: iio: adis16260 add id table support
From: Jonathan Cameron <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/gyro/adis16260_core.c (9647 => 9648)
--- trunk/drivers/staging/iio/gyro/adis16260_core.c 2011-03-01 20:57:15 UTC (rev 9647)
+++ trunk/drivers/staging/iio/gyro/adis16260_core.c 2011-03-01 20:57:20 UTC (rev 9648)
@@ -635,6 +635,12 @@
return ret;
}
+static const struct spi_device_id adis16260_id[] = {
+ {"adis16260", 0},
+ {"adis16265", 0},
+ {}
+};
+
static struct spi_driver adis16260_driver = {
.driver = {
.name = "adis16260",
@@ -642,6 +648,7 @@
},
.probe = adis16260_probe,
.remove = __devexit_p(adis16260_remove),
+ .id_table = adis16260_id,
};
static __init int adis16260_init(void)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
