diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-28 13:17:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-28 13:17:20 +0100 |
| commit | e4340bbb07dd38339c0773543dd928886e512a57 (patch) | |
| tree | f38d9d2f929037325362328415b2a1e7bfe52a15 /arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | |
| parent | c13dc31adb04c3f85d54d2fa13e34206f25742eb (diff) | |
| parent | a22c4d7e34402ccdf3414f64c50365436eba7b93 (diff) | |
| download | op-kernel-dev-e4340bbb07dd38339c0773543dd928886e512a57.zip op-kernel-dev-e4340bbb07dd38339c0773543dd928886e512a57.tar.gz | |
Merge branch 'linus' into core/rcu, to fix up a semantic conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts')
| -rw-r--r-- | arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts index 91146c3..5b04300 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts @@ -12,7 +12,7 @@ / { model = "LogicPD Zoom DM3730 Torpedo Development Kit"; - compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap36xx"; + compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"; gpio_keys { compatible = "gpio-keys"; |
