diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 10:34:46 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 10:34:46 -0600 |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /arch/arm/boot/dts/omap3-beagle-xm.dts | |
| parent | e363bbac316ffb5daaf45d855f82680148cafe20 (diff) | |
| parent | 355e62f5ad12b005c862838156262eb2df2f8dff (diff) | |
| download | op-kernel-dev-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.zip op-kernel-dev-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.gz | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'arch/arm/boot/dts/omap3-beagle-xm.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-beagle-xm.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 0c514dc..2816bf6 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -11,7 +11,7 @@ / { model = "TI OMAP3 BeagleBoard xM"; - compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3"; + compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3"; cpus { cpu@0 { |
