diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-09-12 20:00:59 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-09-12 20:00:59 +0000 |
| commit | c5168016cc028f59b417df77f1f169bf06e40271 (patch) | |
| tree | 98372dc0025cded55ddeddf15fb665203ea8c0de /linux/Makefile.linux | |
| parent | 85c16d962d8f6011b670d74d0669402ec4708f6f (diff) | |
linux drm fixes
Diffstat (limited to 'linux/Makefile.linux')
| -rw-r--r-- | linux/Makefile.linux | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 9de67667..12e0e8c8 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -11,7 +11,7 @@ # everything required for in-kernel source builds. It is included into # this file, so none of that should be duplicated here. # -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.37 2003/04/23 01:48:57 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.40 2003/08/17 17:12:25 dawes Exp $ # # @@ -48,6 +48,7 @@ MODULE_LIST := gamma.o tdfx.o r128.o radeon.o mga.o sis.o # Modules only for ix86 architectures ifneq (,$(findstring 86,$(MACHINE))) +ARCHX86 := 1 MODULE_LIST += i830.o i810.o endif @@ -258,6 +259,12 @@ $(error Only 2.4.x and later kernels are supported \ ($(VERSION).$(PATCHLEVEL).$(SUBLEVEL))) endif +ifdef ARCHX86 +ifndef CONFIG_X86_CMPXCHG +$(error CONFIG_X86_CMPXCHG needs to be enabled in the kernel) +endif +endif + # This needs to go before all other include paths. CC += -I$(DRMSRCDIR) |