Index: kernel/arch/ia64/Makefile.inc
===================================================================
--- kernel/arch/ia64/Makefile.inc	(revision 912ee7cc7683564facff764984003a32d6ea1a7f)
+++ kernel/arch/ia64/Makefile.inc	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
@@ -30,8 +30,4 @@
 #
 
-ifndef CROSS_PREFIX
-	CROSS_PREFIX = /usr/local
-endif
-
 BFD_NAME = elf64-little
 BFD_ARCH = ia64-elf64
@@ -46,45 +42,28 @@
 AFLAGS += -mconstant-gp
 
-DEFS += -D__64_BITS__ -D$(MACHINE)
-
-## Compile with page hash table support.
-#
-
-CONFIG_PAGE_HT = y
-DEFS += -DCONFIG_PAGE_HT
-
-## Compile with support for address space identifiers.
-#
-
-CONFIG_ASID = y
-CONFIG_ASID_FIFO = y
-
-## Compile with support for software integer division.
-#
-
-CONFIG_SOFTINT = y
+DEFS += -D__64_BITS__
 
 ARCH_SOURCES = \
-	arch/$(ARCH)/src/start.S \
-	arch/$(ARCH)/src/asm.S \
-	arch/$(ARCH)/src/dummy.s \
-	arch/$(ARCH)/src/ia64.c \
-	arch/$(ARCH)/src/fpu_context.c \
-	arch/$(ARCH)/src/context.S \
-	arch/$(ARCH)/src/cpu/cpu.c \
-	arch/$(ARCH)/src/ivt.S \
-	arch/$(ARCH)/src/interrupt.c \
-	arch/$(ARCH)/src/mm/as.c \
-	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/mm/page.c \
-	arch/$(ARCH)/src/mm/tlb.c \
-	arch/$(ARCH)/src/mm/vhpt.c \
-	arch/$(ARCH)/src/proc/scheduler.c \
-	arch/$(ARCH)/src/ddi/ddi.c \
-	arch/$(ARCH)/src/smp/smp.c \
-	arch/$(ARCH)/src/drivers/it.c
+	arch/$(KARCH)/src/start.S \
+	arch/$(KARCH)/src/asm.S \
+	arch/$(KARCH)/src/dummy.s \
+	arch/$(KARCH)/src/ia64.c \
+	arch/$(KARCH)/src/fpu_context.c \
+	arch/$(KARCH)/src/context.S \
+	arch/$(KARCH)/src/cpu/cpu.c \
+	arch/$(KARCH)/src/ivt.S \
+	arch/$(KARCH)/src/interrupt.c \
+	arch/$(KARCH)/src/mm/as.c \
+	arch/$(KARCH)/src/mm/frame.c \
+	arch/$(KARCH)/src/mm/page.c \
+	arch/$(KARCH)/src/mm/tlb.c \
+	arch/$(KARCH)/src/mm/vhpt.c \
+	arch/$(KARCH)/src/proc/scheduler.c \
+	arch/$(KARCH)/src/ddi/ddi.c \
+	arch/$(KARCH)/src/smp/smp.c \
+	arch/$(KARCH)/src/drivers/it.c
 
 ifeq ($(MACHINE),ski)
-	ARCH_SOURCES += arch/$(ARCH)/src/ski/ski.c 
+	ARCH_SOURCES += arch/$(KARCH)/src/ski/ski.c
 	DEFS += -DSKI
 	BFD = binary
@@ -92,12 +71,5 @@
 
 ifeq ($(MACHINE),i460GX)
-	CONFIG_I8042 = y
-	CONFIG_EGA = y
-	DEFS += -DI460GX -DCONFIG_I8042 -DCONFIG_EGA
+	DEFS += -DI460GX
 	BFD = binary
 endif
-
-ifeq ($(CONFIG_SMP),y)
-	DEFS += -DCONFIG_SMP
-endif
-