Fix HP simulator Makefile for merge conflict with zx1 support patch.

diff --git a/arch/ia64/hp/sim/Makefile b/arch/ia64/hp/sim/Makefile
index ae7fd79a20faed48b54416783ef06672dc4f971a..b6e692c5f477e7c99e2c5ced8cc0fcacfca58440 100644 (file)
--- 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 <davidm@hpl.hp.com>
 # 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