summaryrefslogtreecommitdiffstats
path: root/drivers/pnp/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-18 00:24:27 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-18 00:24:27 +0000
commitb9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch)
tree707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/pnp/Makefile
parentb3ac367c7a3e6047abe74817db27e34e759f279f (diff)
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/pnp/Makefile')
-rw-r--r--drivers/pnp/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile
index 9c024342a..d9b6fe96b 100644
--- a/drivers/pnp/Makefile
+++ b/drivers/pnp/Makefile
@@ -25,7 +25,7 @@ ifeq ($(CONFIG_ISAPNP),m)
endif
ifeq ($(CONFIG_ISAPNP),y)
- O_TARGET := isa-pnp.o
+ O_TARGET := pnp.o
OX_OBJS := isapnp.o
O_OBJS := quirks.o $(PROC_OBJS)
endif
@@ -33,5 +33,5 @@ endif
include $(TOPDIR)/Rules.make
-isa-pnp.o: isapnp.o quirks.o $(PROC_OBJS)
- $(LD) $(LD_RFLAG) -r -o $@ isapnp.o quirks.o $(PROC_OBJS)
+isa-pnp.o: $(MIX_OBJS) $(MI_OBJS)
+ $(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) $(MI_OBJS)