diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-19 11:00:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-19 11:00:02 +0100 |
| commit | aa3090005d27f3c7fba915ccea36b97b669fa3ab (patch) | |
| tree | e4de079bac5b51b1e1cfacc5393006b857045444 /arch/arm/Makefile | |
| parent | 151b6a5f1d4c547c92ec67a5a6fedc16f435956e (diff) | |
| parent | 448352ae72ef1760c19631a728a3791c1efc52f2 (diff) | |
| download | op-kernel-dev-aa3090005d27f3c7fba915ccea36b97b669fa3ab.zip op-kernel-dev-aa3090005d27f3c7fba915ccea36b97b669fa3ab.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 59c1ce8..4e0b6c8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -183,6 +183,7 @@ machine-$(CONFIG_ARCH_SHARK) := shark machine-$(CONFIG_ARCH_SHMOBILE) := shmobile machine-$(CONFIG_ARCH_STMP378X) := stmp378x machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx +machine-$(CONFIG_ARCH_TCC8K) := tcc8k machine-$(CONFIG_ARCH_TEGRA) := tegra machine-$(CONFIG_ARCH_U300) := u300 machine-$(CONFIG_ARCH_U8500) := ux500 @@ -202,6 +203,7 @@ plat-$(CONFIG_ARCH_MXC) := mxc plat-$(CONFIG_ARCH_OMAP) := omap plat-$(CONFIG_ARCH_S3C64XX) := samsung plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx +plat-$(CONFIG_ARCH_TCC_926) := tcc plat-$(CONFIG_PLAT_IOP) := iop plat-$(CONFIG_PLAT_NOMADIK) := nomadik plat-$(CONFIG_PLAT_ORION) := orion |
