diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/Makefile | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/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 a8d4dca9da35..99b8200138d2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -174,6 +174,7 @@ machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | |||
| 174 | machine-$(CONFIG_ARCH_S5P6442) := s5p6442 | 174 | machine-$(CONFIG_ARCH_S5P6442) := s5p6442 |
| 175 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 | 175 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 |
| 176 | machine-$(CONFIG_ARCH_S5PV210) := s5pv210 | 176 | machine-$(CONFIG_ARCH_S5PV210) := s5pv210 |
| 177 | machine-$(CONFIG_ARCH_S5PV310) := s5pv310 | ||
| 177 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 178 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 178 | machine-$(CONFIG_ARCH_SHARK) := shark | 179 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 179 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile | 180 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile |