diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-25 13:36:09 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-25 13:43:18 -0700 |
| commit | 2655e828350cc7558d1a74cd4464e34b81e17f36 (patch) | |
| tree | ddf5a103b69de5982b102f1f3e8feb6b236a8de1 /arch/arm/Kconfig | |
| parent | cbe461f65427210fd0f2813d72383f66a46889f1 (diff) | |
| parent | 9851ca5774e693e2088a4b34ad456cfaadaf29a7 (diff) | |
Merge branch 'nspire/soc' into next/late
From Daniel Tang <dt.tangr@gmail.com>
This is the initial platform code for the TI-Nspire graphing
calculators. The platform support is rather unspectacular, but still
contains platform data for the LCD panel, which will get removed once
there is a DT binding for the AMBA CLCD driver.
* nspire/soc:
arm: Add Initial TI-Nspire support
arm: Add device trees for TI-Nspire hardware
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dfb4fee1f55..aa27704be4e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -964,6 +964,8 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" +source "arch/arm/mach-nspire/Kconfig" + source "arch/arm/plat-omap/Kconfig" source "arch/arm/mach-omap1/Kconfig" |