diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-18 06:27:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-18 06:27:07 -0500 |
| commit | 8213084125eed3c5efbc5e13739b93dfedb88590 (patch) | |
| tree | b98d91de82a4a39a47c6031832271341ecf5e8e0 /arch/arm/Makefile | |
| parent | 66822b2eef8de9fe3ec9fa837386817565dbe690 (diff) | |
| parent | b77bfa84c419e3ec8b8e3fd4b4579e5761b7c943 (diff) | |
Merge NetSilicon NS93xx tree
Fixed conflicts:
arch/arm/Makefile
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2cd871c82c96..1320418b5d6f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -124,10 +124,12 @@ endif | |||
| 124 | machine-$(CONFIG_ARCH_H720X) := h720x | 124 | machine-$(CONFIG_ARCH_H720X) := h720x |
| 125 | machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 | 125 | machine-$(CONFIG_ARCH_AAEC2000) := aaec2000 |
| 126 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 126 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
| 127 | machine-$(CONFIG_ARCH_AT91) := at91 | 127 | machine-$(CONFIG_ARCH_AT91) := at91rm9200 |
| 128 | machine-$(CONFIG_ARCH_EP93XX) := ep93xx | 128 | machine-$(CONFIG_ARCH_EP93XX) := ep93xx |
| 129 | machine-$(CONFIG_ARCH_PNX4008) := pnx4008 | 129 | machine-$(CONFIG_ARCH_PNX4008) := pnx4008 |
| 130 | machine-$(CONFIG_ARCH_NETX) := netx | 130 | machine-$(CONFIG_ARCH_NETX) := netx |
| 131 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | ||
| 132 | textofs-$(CONFIG_ARCH_NS9XXX) := 0x00108000 | ||
| 131 | 133 | ||
| 132 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 134 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
| 133 | # This is what happens if you forget the IOCS16 line. | 135 | # This is what happens if you forget the IOCS16 line. |