diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/Makefile | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
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 2dca13f60168..ed820e737a8a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -176,6 +176,7 @@ machine-$(CONFIG_ARCH_U300) := u300 | |||
| 176 | machine-$(CONFIG_ARCH_U8500) := ux500 | 176 | machine-$(CONFIG_ARCH_U8500) := ux500 |
| 177 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 177 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
| 178 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | 178 | machine-$(CONFIG_ARCH_W90X900) := w90x900 |
| 179 | machine-$(CONFIG_ARCH_NUC93X) := nuc93x | ||
| 179 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 180 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 180 | 181 | ||
| 181 | # Platform directory name. This list is sorted alphanumerically | 182 | # Platform directory name. This list is sorted alphanumerically |