diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-07 15:03:42 +0200 |
| commit | 436281c9a110ff16c1fb396add5dd944ee92cf36 (patch) | |
| tree | afda86db9e89d41ca49a8311673b994a82d16d42 /Documentation/devicetree/bindings/sound/sgtl5000.txt | |
| parent | 4cbb62148cd686c2d3618861deb15eeb83744405 (diff) | |
| parent | febb72a6e4cc6c8cffcc1ea649a3fb364f1ea432 (diff) | |
| download | linux-436281c9a110ff16c1fb396add5dd944ee92cf36.tar.gz linux-436281c9a110ff16c1fb396add5dd944ee92cf36.tar.bz2 linux-436281c9a110ff16c1fb396add5dd944ee92cf36.zip | |
Merge branch 'linus' into sched/core
Merge reason: We were on a pretty old base, refresh before moving on.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/sound/sgtl5000.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/sgtl5000.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt index 2c3cd413f042..9cc44449508d 100644 --- a/Documentation/devicetree/bindings/sound/sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt @@ -3,6 +3,8 @@ Required properties: - compatible : "fsl,sgtl5000". +- reg : the I2C address of the device + Example: codec: sgtl5000@0a { |