diff options
| author | Chris Zankel <chris@zankel.net> | 2015-04-14 05:51:35 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-04-14 05:51:35 +0200 |
| commit | 7ead5b7e4a3cf4a16579a8f164022345b93fe972 (patch) | |
| tree | 0a9b9497f53d1593c9e2ac197b2e686ea74a9975 /arch/arm/boot/dts/at91sam9n12ek.dts | |
| parent | xtensa: Fix fix linker script transformation for .text / .text.fixup (diff) | |
| parent | Linux 4.0 (diff) | |
| download | linux-7ead5b7e4a3cf4a16579a8f164022345b93fe972.tar.xz linux-7ead5b7e4a3cf4a16579a8f164022345b93fe972.zip | |
Merge tag 'v4.0' into for_next
Linux 4.0
Diffstat (limited to 'arch/arm/boot/dts/at91sam9n12ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9n12ek.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index 13bb24ea971a..9575c0d895c9 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -54,7 +54,7 @@ status = "okay"; wm8904: codec@1a { - compatible = "wm8904"; + compatible = "wlf,wm8904"; reg = <0x1a>; clocks = <&pck0>; clock-names = "mclk"; |