diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
| commit | 37aa48368f2508defb1976be62e1ed6ca4dde683 (patch) | |
| tree | 59b606c740ddd10259fbf2248bb50498a319fa6d /arch/arm/boot/dts/kirkwood-laplug.dts | |
| parent | 1da4f83c0c43f25baf356c4cc719255877da6b1e (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
| download | linux-37aa48368f2508defb1976be62e1ed6ca4dde683.tar.xz | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-laplug.dts')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-laplug.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts index c9e82ef..6761ffa 100644 --- a/arch/arm/boot/dts/kirkwood-laplug.dts +++ b/arch/arm/boot/dts/kirkwood-laplug.dts @@ -48,7 +48,7 @@ status = "okay"; eeprom@50 { - compatible = "at,24c04"; + compatible = "atmel,24c04"; pagesize = <16>; reg = <0x50>; }; |