diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 14:37:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 14:37:49 -0400 |
| commit | 91b90475e793e84a57d956af8c52645e292badcb (patch) | |
| tree | 8de670e02f99a2a2bde82384104dcb8cb09cdadf /arch/arm/Makefile | |
| parent | bcc408b75b707f46da1f81058ffa3c9df6f0170f (diff) | |
| parent | f0ffeddc897a5cc5d5c6cc1b99a8799a8b34b28f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 2277e3d179cc..8330495e2448 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -97,6 +97,7 @@ textaddr-$(CONFIG_ARCH_FORTUNET) := 0xc0008000 | |||
| 97 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 97 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
| 98 | machine-$(CONFIG_ARCH_IMX) := imx | 98 | machine-$(CONFIG_ARCH_IMX) := imx |
| 99 | machine-$(CONFIG_ARCH_H720X) := h720x | 99 | machine-$(CONFIG_ARCH_H720X) := h720x |
| 100 | machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 | ||
| 100 | 101 | ||
| 101 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 102 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
| 102 | # This is what happens if you forget the IOCS16 line. | 103 | # This is what happens if you forget the IOCS16 line. |