diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /arch/arm/Makefile | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6b4033705..ad8e9423a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -121,6 +121,11 @@ MACHINE = ebsa110 ARCHDIR = ebsa110 endif +ifeq ($(CONFIG_ARCH_CLPS7500),y) +MACHINE = clps7500 +ARCHDIR = cl7500 +endif + ifeq ($(CONFIG_FOOTBRIDGE),y) MACHINE = footbridge ARCHDIR = ebsa285 @@ -135,6 +140,11 @@ MACHINE = nexuspci ARCHDIR = nexuspci endif +ifeq ($(CONFIG_ARCH_SHARK),y) +MACHINE = shark +ARCHDIR = shark +endif + ifeq ($(CONFIG_ARCH_SA1100),y) MACHINE = sa1100 ARCHDIR = sa1100 @@ -160,6 +170,11 @@ DRIVERS += drivers/acorn/net/acorn-net.a DRIVERS += drivers/acorn/scsi/acorn-scsi.a endif +ifeq ($(CONFIG_ARCH_CLPS7500),y) +SUBDIRS += drivers/acorn/char +DRIVERS += drivers/acorn/char/acorn-char.o +endif + MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot # The following is a hack to get 'constants.h' up |