Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Germaschewski <kai@vaio.(none)>2002-02-10 17:55:34 +0100
committerKai Germaschewski <kai@vaio.(none)>2002-02-10 17:55:34 +0100
commit64d746f0be892326dcde81a4feabfc9bf4f08325 (patch)
tree1b31cff4b990095d4f058b6f72436271a1ba2815
parentf2d6b6d8ed483f9eef6ae14560d67056c2b83b71 (diff)
parentfaaa05a9ecad6760e884cb1cff32c18194181361 (diff)
Merge vaio.(none):/home/kai/kernel/linux-2.5.isdn.link_order
into vaio.(none):/home/kai/kernel/linux-2.5.isdn
-rw-r--r--Makefile2
-rw-r--r--drivers/isdn/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bf1060fc58ba..a611acec52ef 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,6 @@ DRIVERS-y += drivers/base/base.o \
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
@@ -187,6 +186,7 @@ DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
+DRIVERS-$(CONFIG_ISDN) += drivers/isdn/vmlinux-obj.o
DRIVERS := $(DRIVERS-y)
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index a30e5f9709d2..88e37e3d47c9 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -2,7 +2,7 @@
# The target object and module list name.
-O_TARGET := isdn.a
+O_TARGET := vmlinux-obj.o
# Objects that export symbols.