Index: Makefile
===================================================================
RCS file: /home/cvs/linux/Makefile,v
retrieving revision 1.213
diff -u -r1.213 Makefile
--- Makefile	11 Mar 2004 16:46:39 -0000	1.213
+++ Makefile	27 Mar 2004 08:00:03 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 4
-EXTRAVERSION =
+EXTRAVERSION = iluxa_minsetIP32
 NAME=Feisty Dunnart
 
 # *DOCUMENTATION*
Index: arch/mips/Makefile
===================================================================
RCS file: /home/cvs/linux/arch/mips/Makefile,v
retrieving revision 1.167
diff -u -r1.167 Makefile
--- arch/mips/Makefile	24 Mar 2004 17:07:53 -0000	1.167
+++ arch/mips/Makefile	27 Mar 2004 08:00:13 -0000
@@ -35,13 +35,14 @@
 endif
 ifdef CONFIG_MIPS64
 gcc-abi			= 64
-gas-abi			= 32
+#gas-abi		= 32
+gas-abi			= o64
 tool-prefix		= $(64bit-tool-prefix)
 UTS_MACHINE		:= mips64
 endif
 
 ifdef CONFIG_CROSSCOMPILE
-CROSS_COMPILE		:= $(tool-prefix)
+CROSS_COMPILE		:= /crossdev/$(UTS_MACHINE)/bin/$(tool-prefix)
 endif
 
 #
@@ -98,7 +99,7 @@
 else \
 	gcc_abi=; gcc_isa=-$(5); \
 fi; \
-gas_abi=-Wa,-$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
+gas_abi=-Wa,-mabi=$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
 while :; do \
 	for gas_opt in -Wa,-march= -Wa,-mcpu=; do \
 		$(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \
@@ -109,7 +110,7 @@
 	break; \
 done; \
 if test "$(gcc-abi)" != "$(gas-abi)"; then \
-	gas_abi="-Wa,-$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
+	gas_abi="-Wa,-mabi=$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
 fi; \
 if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \
 	$(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \
@@ -633,7 +634,7 @@
 # ELF files from 32-bit files by conversion.
 #
 #AS += -64
-#LDFLAGS += -m elf64bmip
+LDFLAGS += -m elf64btsmip
 
 #
 # Choosing incompatible machines durings configuration will result in
Index: arch/mips/sgi-ip32/ip32-reset.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/sgi-ip32/ip32-reset.c,v
retrieving revision 1.7
diff -u -r1.7 ip32-reset.c
--- arch/mips/sgi-ip32/ip32-reset.c	30 Jan 2004 14:14:14 -0000	1.7
+++ arch/mips/sgi-ip32/ip32-reset.c	27 Mar 2004 08:00:16 -0000
@@ -189,6 +189,7 @@
 	_machine_restart = ip32_machine_restart;
 	_machine_halt = ip32_machine_halt;
 	_machine_power_off = ip32_machine_power_off;
+	return 0;
 	request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL);
 	init_timer(&blink_timer);
 	blink_timer.function = blink_timeout;
Index: drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
===================================================================
RCS file: /home/cvs/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c,v
retrieving revision 1.10
diff -u -r1.10 aic7xxx_osm_pci.c
--- drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	5 Feb 2004 02:40:03 -0000	1.10
+++ drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	27 Mar 2004 08:00:31 -0000
@@ -312,7 +312,7 @@
 	command &= ~(PCIM_CMD_PORTEN|PCIM_CMD_MEMEN);
 	base = 0;
 	maddr = NULL;
-	error = ahc_linux_pci_reserve_mem_region(ahc, &base, &maddr);
+	error = -EBUSY;//ahc_linux_pci_reserve_mem_region(ahc, &base, &maddr);
 	if (error == 0) {
 		ahc->platform_data->mem_busaddr = base;
 		ahc->tag = BUS_SPACE_MEMIO;
Index: drivers/video/gbefb.c
===================================================================
RCS file: /home/cvs/linux/drivers/video/gbefb.c,v
retrieving revision 1.2
diff -u -r1.2 gbefb.c
--- drivers/video/gbefb.c	10 Mar 2004 23:10:08 -0000	1.2
+++ drivers/video/gbefb.c	27 Mar 2004 08:00:33 -0000
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/mm.h>
 #include <linux/module.h>
 
 #ifdef CONFIG_X86
@@ -1089,6 +1088,7 @@
 	}
 
 	gbe = (struct sgi_gbe *) ioremap(GBE_BASE, sizeof(struct sgi_gbe));
+	printk("GBE INIT\n");
 	if (!gbe) {
 		printk(KERN_ERR "gbefb: couldn't map mmio region\n");
 		ret = -ENXIO;