diff --git a/[refs] b/[refs] index f60aff37ea0a..ba678d9bf50c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4266868c9cc8abebdad4b570d2df65a71ad46e03 +refs/heads/master: 8df322385a7e253672dc5077c11dc1a6219d25cc diff --git a/trunk/drivers/staging/iio/addac/adt7316.c b/trunk/drivers/staging/iio/addac/adt7316.c index 637316f79f78..c828b6f0a281 100644 --- a/trunk/drivers/staging/iio/addac/adt7316.c +++ b/trunk/drivers/staging/iio/addac/adt7316.c @@ -203,7 +203,7 @@ struct adt7316_chip_info { #define ADT7316_TEMP_INT_MASK 0x1F #define ADT7516_AIN_INT_MASK 0xE0 #define ADT7316_TEMP_AIN_INT_MASK \ - (ADT7316_TEMP_INT_MASK | ADT7316_TEMP_INT_MASK) + (ADT7316_TEMP_INT_MASK) /* * struct adt7316_chip_info - chip specifc information