--- linux-2.6.5/arch/ia64/Makefile~	2004-04-15 09:49:38.947393512 +0200
+++ linux-2.6.5/arch/ia64/Makefile	2004-04-15 09:49:38.947393512 +0200
@@ -59,8 +59,9 @@
 core-$(CONFIG_IA64_DIG) 	+= arch/ia64/dig/
 core-$(CONFIG_IA64_GENERIC) 	+= arch/ia64/dig/
 core-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/dig/
-core-$(CONFIG_IA64_SGI_SN2)	+= arch/ia64/sn/
-
+ifeq ($(DISCONTIGMEM),y)
+	core-$(CONFIG_IA64_SGI_SN2)	+= arch/ia64/sn/
+endif
 drivers-$(CONFIG_PCI)		+= arch/ia64/pci/
 drivers-$(CONFIG_IA64_HP_SIM)	+= arch/ia64/hp/sim/
 drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/
--- linux-2.6.5/arch/ia64/Makefile~	2004-04-15 10:33:42.918448816 +0200
+++ linux-2.6.5/arch/ia64/Makefile	2004-04-15 10:33:42.918448816 +0200
@@ -65,7 +65,10 @@
 drivers-$(CONFIG_PCI)		+= arch/ia64/pci/
 drivers-$(CONFIG_IA64_HP_SIM)	+= arch/ia64/hp/sim/
 drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/
-drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/
+drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/
+ifeq ($(DISCONTIGMEM),y)
+drivers-$(CONFIG_IA64_GENERIC)	+=   arch/ia64/sn/
+endif
 drivers-$(CONFIG_OPROFILE)	+= arch/ia64/oprofile/
 
 boot := arch/ia64/hp/sim/boot
--- linux-2.6.5/drivers/char/Kconfig~	2004-04-15 10:46:32.614437240 +0200
+++ linux-2.6.5/drivers/char/Kconfig	2004-04-15 10:46:32.614437240 +0200
@@ -375,7 +375,7 @@
 
 config SGI_L1_SERIAL
 	bool "SGI Altix L1 serial support"
-	depends on SERIAL_NONSTANDARD && IA64
+	depends on SERIAL_NONSTANDARD && IA64 && DISCONTIGMEM
 	help
 	  If you have an SGI Altix and you want to use the serial port
 	  connected to the system controller (you want this!), say Y.