diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/arm/Makefile | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
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 63d998e8c672..24f58d8576ed 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 |