diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-05-04 20:13:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:41:44 -0800 |
| commit | 0e5eec3307ce47cb03f9405b1c227b400611b24b (patch) | |
| tree | 7b2218e81ffe363ecace509f813feca5cf37e4c6 | |
| parent | fabe9aa0c0b7c0a3182c09d566b15f34f96ae0e4 (diff) | |
placeholders for merging
Rebase-Id: R177e2f8e2b79f789558d19e4b17863c9b29fab9e
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/Makefile | 8 | ||||
| -rw-r--r-- | arch/arm/tools/mach-types | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 784ce614b8b9..d4b92995237c 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -78,6 +78,14 @@ config MACH_WARIO help Support for the Wario version of Seaboard +# Whistler + +# Aruba + +# Cardhu + +# Enterprise + choice prompt "Low-level debug console UART" default TEGRA_DEBUG_UART_NONE diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index a26678df6d2c..116eef5845f1 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -70,3 +70,11 @@ obj-${CONFIG_MACH_VENTANA} += board-ventana-pinmux.o obj-${CONFIG_MACH_VENTANA} += board-ventana-sdhci.o obj-${CONFIG_MACH_VENTANA} += board-ventana-power.o obj-${CONFIG_MACH_VENTANA} += board-ventana-panel.o + +# Aruba + +# Whistler + +# Cardhu + +# Enterprise diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 62cc8f981171..1a044e2117a5 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -1113,3 +1113,4 @@ blissc MACH_BLISSC BLISSC 3491 thales_adc MACH_THALES_ADC THALES_ADC 3492 ubisys_p9d_evp MACH_UBISYS_P9D_EVP UBISYS_P9D_EVP 3493 atdgp318 MACH_ATDGP318 ATDGP318 3494 +# Enterprise |