diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:53:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-03-11 11:53:50 +0100 |
| commit | 0066f3b93e144762b409940fa37bb1cd36c1baf7 (patch) | |
| tree | 0c99b2754fb16c2a787bc1d086bd6fb268b12b1a /arch/arm/boot/dts/omap3-igep0030.dts | |
| parent | e65312fe868da53077780de618e213a53dc90d00 (diff) | |
| parent | b8ad0f912b93c23c34dfedc615a0eeba6ca29463 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/omap3-igep0030.dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep0030.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts index 145c58cfc8a..2793749eb1b 100644 --- a/arch/arm/boot/dts/omap3-igep0030.dts +++ b/arch/arm/boot/dts/omap3-igep0030.dts @@ -13,7 +13,7 @@ / { model = "IGEP COM MODULE (TI OMAP AM/DM37x)"; - compatible = "isee,omap3-igep0030", "ti,omap3"; + compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3"; leds { pinctrl-names = "default"; |