--- vmmon-only/Makefile.kernel	2004-03-10 07:59:32.000000000 +0900
+++ vmmon-only/Makefile.kernel	2004-04-05 12:57:02.000000000 +0900
@@ -11,20 +11,10 @@ 
 
 CC_WARNINGS := -Wall -Wstrict-prototypes 
 CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) 
-
-ifeq ($(shell $(GREP) 'FIX_IO_APIC_BASE_0' $(HEADER_DIR)/asm/fixmap.h 2>/dev/null),)
-CC_OPTS += -DVMWARE__FIX_IO_APIC_BASE=FIX_IO_APIC_BASE
-else
 CC_OPTS += -DVMWARE__FIX_IO_APIC_BASE=FIX_IO_APIC_BASE_0
-endif
-
-ifneq ($(shell $(GREP) 'struct poll_wqueues' $(HEADER_DIR)/linux/poll.h 2>/dev/null),)
 CC_OPTS += -DVMW_HAVE_EPOLL
-endif
-
 CC_OPTS += -DVMW_USING_KBUILD
-
 INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
 
 EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
--- vmmon-only/Makefile	2004-03-10 07:59:33.000000000 +0900
+++ vmmon-only/Makefile	2004-05-14 00:01:27.476553135 +0900
@@ -76,14 +76,18 @@ 
 MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES))
 
 $(DRIVER_KO):
+ifdef EXTRAVERSION
+	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) EXTRAVERSION=$(EXTRAVERSION) modules
+else
 	make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules
+endif
 
 else
 
 ifneq ($(VM_CCVER), $(VMCCVER))
 $(warning *** Inappropriate build environment: you wanted to use gcc \
  version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).)
-$(error For proper build you'll have to replace $(CC) with symbolic \
+$(error For proper build you will have to replace $(CC) with symbolic \
  link to $(VM_CC))
 endif