diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-24 14:35:18 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-24 14:35:18 +0000 |
commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/linux/mfd/arizona | |
parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
download | linux-stable-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.tar.gz linux-stable-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.tar.bz2 linux-stable-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.zip |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/linux/mfd/arizona')
-rw-r--r-- | include/linux/mfd/arizona/registers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h index f1088c2a9d24..89878149a43f 100644 --- a/include/linux/mfd/arizona/registers.h +++ b/include/linux/mfd/arizona/registers.h @@ -1942,7 +1942,7 @@ #define ARIZONA_FLL2_SYNC_GAIN_MASK 0x003c /* FLL2_SYNC_GAIN */ #define ARIZONA_FLL2_SYNC_GAIN_SHIFT 2 /* FLL2_SYNC_GAIN */ #define ARIZONA_FLL2_SYNC_GAIN_WIDTH 4 /* FLL2_SYNC_GAIN */ -#define ARIZONA_FLL2_SYNC_BW_MASK 0x0001 /* FLL2_SYNC_BW */ +#define ARIZONA_FLL2_SYNC_BW 0x0001 /* FLL2_SYNC_BW */ #define ARIZONA_FLL2_SYNC_BW_MASK 0x0001 /* FLL2_SYNC_BW */ #define ARIZONA_FLL2_SYNC_BW_SHIFT 0 /* FLL2_SYNC_BW */ #define ARIZONA_FLL2_SYNC_BW_WIDTH 1 /* FLL2_SYNC_BW */ |