Title: [9641] trunk/drivers/staging/iio/gyro/adis16251.h: merge from upstream: staging: fix iio/gyro typos, build errors
Revision
9641
Author
vapier
Date
2011-03-01 15:56:50 -0500 (Tue, 01 Mar 2011)

Log Message

merge from upstream: staging: fix iio/gyro typos, build errors

From: Randy Dunlap <[email protected]>

Typo causes build errors.  Did anyone even build this driver?

Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/gyro/adis16251.h (9640 => 9641)


--- trunk/drivers/staging/iio/gyro/adis16251.h	2011-03-01 20:56:46 UTC (rev 9640)
+++ trunk/drivers/staging/iio/gyro/adis16251.h	2011-03-01 20:56:50 UTC (rev 9641)
@@ -56,14 +56,14 @@
 #define ADIS16251_DIAG_STAT_POWER_HIGH	(1<<1)
 #define ADIS16251_DIAG_STAT_POWER_LOW	(1<<0)
 
-#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16261_DIAG_STAT_ALARM2 | \
-				      ADIS16261_DIAG_STAT_ALARM1 | \
-				      ADIS16261_DIAG_STAT_SELF_TEST | \
-				      ADIS16261_DIAG_STAT_OVERFLOW | \
-				      ADIS16261_DIAG_STAT_SPI_FAIL | \
-				      ADIS16261_DIAG_STAT_FLASH_UPT | \
-				      ADIS16261_DIAG_STAT_POWER_HIGH | \
-				      ADIS16261_DIAG_STAT_POWER_LOW)
+#define ADIS16251_DIAG_STAT_ERR_MASK (ADIS16251_DIAG_STAT_ALARM2 | \
+				      ADIS16251_DIAG_STAT_ALARM1 | \
+				      ADIS16251_DIAG_STAT_SELF_TEST | \
+				      ADIS16251_DIAG_STAT_OVERFLOW | \
+				      ADIS16251_DIAG_STAT_SPI_FAIL | \
+				      ADIS16251_DIAG_STAT_FLASH_UPT | \
+				      ADIS16251_DIAG_STAT_POWER_HIGH | \
+				      ADIS16251_DIAG_STAT_POWER_LOW)
 
 /* GLOB_CMD */
 #define ADIS16251_GLOB_CMD_SW_RESET	(1<<7)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to