diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:31:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:31:07 -0500 |
| commit | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch) | |
| tree | a434977a6caa9b41cc0daaf71dbd76ac8693aba6 /arch/arm/Makefile | |
| parent | b93a4afcff7be859e30cad2a305731516057d6cf (diff) | |
| parent | 17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a99aafebdfb4..10e933b2f40c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -167,6 +167,7 @@ machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | |||
| 167 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 | 167 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 |
| 168 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 168 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 169 | machine-$(CONFIG_ARCH_SHARK) := shark | 169 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 170 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile | ||
| 170 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x | 171 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x |
| 171 | machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx | 172 | machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx |
| 172 | machine-$(CONFIG_ARCH_U300) := u300 | 173 | machine-$(CONFIG_ARCH_U300) := u300 |