Merge foobazco.org:/sources/2.5-sparc-smp

into foobazco.org:/sources/2.5-sparc-todave

arch/sparc/kernel/process.c

@@ -40,6 +40,7 @@
 #include <asm/processor.h>
 #include <asm/psr.h>
 #include <asm/elf.h>
+#include <asm/unistd.h>
 
 /* 
  * Power management idle function 

sound/core/memalloc.c

@@ -790,7 +790,7 @@ static int snd_mem_proc_read(char *page, char **start, off_t off,
 		case SNDRV_DMA_TYPE_SBUS:
 			{
 				struct sbus_dev *sdev = (struct sbus_dev *)(mem->dev.dev);
-				len += sprintf(page + len, "SBUS [%x]", sbus->slot);
+				len += sprintf(page + len, "SBUS [%x]", sdev->slot);
 			}
 			break;
 #endif