diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:11:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:11:25 +0200 |
| commit | 1c816bad41fea5470e8077ae4e661f3f9b5ada64 (patch) | |
| tree | 5e923d12b6284a711d66efee822ca48f95ebf1af /include/dt-bindings/sound/cs42l42.h | |
| parent | staging: rtl8192e: Fix issues reported by checkpatch.pl (diff) | |
| parent | Linux 4.11-rc4 (diff) | |
| download | linux-1c816bad41fea5470e8077ae4e661f3f9b5ada64.tar.xz linux-1c816bad41fea5470e8077ae4e661f3f9b5ada64.zip | |
Merge 4.11-rc4 into staging-next
We need the IIO fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/dt-bindings/sound/cs42l42.h')
| -rw-r--r-- | include/dt-bindings/sound/cs42l42.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/sound/cs42l42.h b/include/dt-bindings/sound/cs42l42.h index 399a123aed58..db69d84ed7d1 100644 --- a/include/dt-bindings/sound/cs42l42.h +++ b/include/dt-bindings/sound/cs42l42.h @@ -20,7 +20,7 @@ #define CS42L42_HPOUT_LOAD_1NF 0 #define CS42L42_HPOUT_LOAD_10NF 1 -/* HPOUT Clamp to GND Overide */ +/* HPOUT Clamp to GND Override */ #define CS42L42_HPOUT_CLAMP_EN 0 #define CS42L42_HPOUT_CLAMP_DIS 1 |