Re: Happy new year^H^H^H^Hkernel..

Linus Torvalds
2001-01-01T18:10:40Z

On 1 Jan 2001, Adam Sampson wrote:
>
> It appears to work (even with the reiserfs patch with the obvious
> Makefile tweak), but the drm modules have unresolved symbols:

Does this fix it for you (do a "make clean" before re-building your tree)?

Linus

----
--- v2.4.0-prerelease/linux/drivers/char/drm/Makefile Mon Jan 1 09:38:35 2001
+++ linux/drivers/char/drm/Makefile Mon Jan 1 09:38:04 2001
@@ -44,22 +44,22 @@
mga-objs := mga_drv.o mga_dma.o mga_context.o mga_bufs.o mga_state.o
i810-objs := i810_drv.o i810_dma.o i810_context.o i810_bufs.o

-obj-$(CONFIG_DRM_GAMMA) += gamma.o
-obj-$(CONFIG_DRM_TDFX) += tdfx.o
-obj-$(CONFIG_DRM_R128) += r128.o
-obj-$(CONFIG_DRM_FFB) += ffb.o
-obj-$(CONFIG_DRM_MGA) += mga.o
-obj-$(CONFIG_DRM_I810) += i810.o
-
-
# When linking into the kernel, link the library just once.
# If making modules, we include the library into each module

ifdef MAKING_MODULES
lib = drmlib.a
else
- obj-y += drmlib.a
+ extra-obj = drmlib.a
endif
+
+obj-$(CONFIG_DRM_GAMMA) += gamma.o $(extra-obj)
+obj-$(CONFIG_DRM_TDFX) += tdfx.o $(extra-obj)
+obj-$(CONFIG_DRM_R128) += r128.o $(extra-obj)
+obj-$(CONFIG_DRM_FFB) += ffb.o $(extra-obj)
+obj-$(CONFIG_DRM_MGA) += mga.o $(extra-obj)
+obj-$(CONFIG_DRM_I810) += i810.o $(extra-obj)
+

include $(TOPDIR)/Rules.make