From 25fb6642a884436c2f14ead556e7733d2111a4ed Mon Sep 17 00:00:00 2001 From: David Mosberger Date: Fri, 5 Apr 2002 01:34:52 -0800 Subject: [PATCH] Fix HP simulator Makefile for merge conflict with zx1 support patch. --- arch/ia64/hp/sim/Makefile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/ia64/hp/sim/Makefile b/arch/ia64/hp/sim/Makefile index ae7fd79a20fa..b6e692c5f477 100644 --- a/arch/ia64/hp/sim/Makefile +++ b/arch/ia64/hp/sim/Makefile @@ -1,6 +1,8 @@ # # ia64/platform/hp/sim/Makefile # +# Copyright (C) 2002 Hewlett-Packard Co. +# David Mosberger-Tang # Copyright (C) 1999 Silicon Graphics, Inc. # Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com) # @@ -10,17 +12,8 @@ O_TARGET := sim.o obj-y := hpsim_console.o hpsim_irq.o hpsim_setup.o obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o -include $(TOPDIR)/Rules.make -# -# ia64/platform/hp/sim/Makefile -# -# Copyright (C) 1999 Silicon Graphics, Inc. -# Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com) -# - -O_TARGET := sim.o - -obj-y := hpsim_console.o hpsim_irq.o hpsim_setup.o -obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o +obj-$(CONFIG_HP_SIMETH) += simeth.o +obj-$(CONFIG_HP_SIMSERIAL) += simserial.o +obj-$(CONFIG_HP_SIMSCSI) += simscsi.o include $(TOPDIR)/Rules.make -- 2.39.5