--- 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,19 +11,9 @@ 
 
 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)