Merge bk://bk.arm.linux.org.uk/linux-2.5-rmk

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/arm/kernel/pm.c

@@ -11,6 +11,8 @@
 #include <linux/config.h>
 #include <linux/pm.h>
 #include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/sched.h>
 
 #include <asm/leds.h>
 #include <asm/system.h>

arch/arm/lib/lib1funcs.S

@@ -52,10 +52,6 @@ divisor		.req	r1
 result		.req	r2
 overdone        .req    r2
 curbit		.req	r3
-ip		.req	r12
-sp		.req	r13
-lr		.req	r14
-pc		.req	r15
 	
 ENTRY(__udivsi3)
 	cmp	divisor, #0

arch/arm/mach-sa1100/generic.c

@@ -138,11 +138,14 @@ static struct resource sa11x0udc_resources[] = {
 	},
 };
 
+static u64 sa11x0udc_dma_mask = 0xffffffffUL;
+
 static struct platform_device sa11x0udc_device = {
 	.name		= "sa11x0-udc",
 	.id		= 0,
 	.dev		= {
 		.name	= "Intel Corporation SA11x0 [UDC]",
+		.dma_mask = &sa11x0udc_dma_mask,
 	},
 	.num_resources	= ARRAY_SIZE(sa11x0udc_resources),
 	.resource	= sa11x0udc_resources,
@@ -166,6 +169,27 @@ static struct platform_device sa11x0mcp_device = {
 	.resource	= sa11x0mcp_resources,
 };
 
+static struct resource sa11x0ssp_resources[] = {
+	[0] = {
+		.start	= 0x80070000,
+		.end	= 0x8007ffff,
+		.flags	= IORESOURCE_MEM,
+	},
+};
+
+static u64 sa11x0ssp_dma_mask = 0xffffffffUL;
+
+static struct platform_device sa11x0ssp_device = {
+	.name		= "sa11x0-ssp",
+	.id		= 0,
+	.dev = {
+		.name	= "Intel Corporation SA11x0 [SSP]",
+		.dma_mask = &sa11x0ssp_dma_mask,
+	},
+	.num_resources	= ARRAY_SIZE(sa11x0ssp_resources),
+	.resource	= sa11x0ssp_resources,
+};
+
 static struct resource sa11x0fb_resources[] = {
 	[0] = {
 		.start	= 0xb0100000,
@@ -200,6 +224,7 @@ static struct platform_device sa11x0pcmcia_device = {
 static struct platform_device *sa11x0_devices[] __initdata = {
 	&sa11x0udc_device,
 	&sa11x0mcp_device,
+	&sa11x0ssp_device,
 	&sa11x0pcmcia_device,
 	&sa11x0fb_device,
 };

arch/arm/tools/mach-types

@@ -6,7 +6,7 @@
 # To add an entry into this database, please see Documentation/arm/README,
 # or contact rmk@arm.linux.org.uk
 #
-# Last update: Wed May 7 23:43:08 2003
+# Last update: Thu Jun 19 18:42:39 2003
 #
 # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
 #
@@ -259,7 +259,7 @@ stork_nest		ARCH_STORK_NEST		STORK_NEST		247
 stork_egg		ARCH_STORK_EGG		STORK_EGG		248
 wismo			SA1100_WISMO		WISMO			249
 ezlinx			ARCH_EZLINX		EZLINX			250
-at91			ARCH_AT91		AT91			251
+at91rm9200		ARCH_AT91		AT91			251
 orion			ARCH_ORION		ORION			252
 neptune			ARCH_NEPTUNE		NEPTUNE			253
 hackkit			SA1100_HACKKIT		HACKKIT			254
@@ -332,10 +332,26 @@ pxa_pooh		ARCH_PXA_POOH		PXA_POOH		320
 bandon			ARCH_BANDON		BANDON			321
 pcm7210			ARCH_PCM7210		PCM7210			322
 nms9200			ARCH_NMS9200		NMS9200			323
-gealog			ARCH_GEALOG		GEALOG			324
+logodl			ARCH_LOGODL		LOGODL			324
 m7140			SA1100_M7140		M7140			325
 korebot			ARCH_KOREBOT		KOREBOT			326
 iq31244			ARCH_IQ31244		IQ31244			327
 koan393			SA1100_KOAN393		KOAN393			328
 inhandftip3		ARCH_INHANDFTIP3	INHANDFTIP3		329
 gonzo			ARCH_GONZO		GONZO			330
+bast			ARCH_BAST		BAST			331
+scanpass		ARCH_SCANPASS		SCANPASS		332
+ep7312_pooh		ARCH_EP7312_POOH	EP7312_POOH		333
+ta7s			ARCH_TA7S		TA7S			334
+ta7v			ARCH_TA7V		TA7V			335
+icarus			SA1100_ICARUS		ICARUS			336
+h1900			ARCH_H1900		H1900			337
+gemini			SA1100_GEMINI		GEMINI			338
+axim			ARCH_AXIM		AXIM			339
+audiotron		ARCH_AUDIOTRON		AUDIOTRON		340
+h2200			ARCH_H2200		H2200			341
+loox600			ARCH_LOOX600		LOOX600			342
+niop			ARCH_NIOP		NIOP			343
+dm310			ARCH_DM310		DM310			344
+seedpxa_c2		ARCH_SEEDPXA_C2		SEEDPXA_C2		345
+ixp4xx_mguardpci	ARCH_IXP4XX_MGUARD_PCI	IXP4XX_MGUARD_PCI	346

drivers/scsi/arm/powertec.c

@@ -235,18 +235,17 @@ powertecscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
  *		        of the required information.
  *	      offset  - offset into information that we have read upto.
  *	      length  - length of buffer
- *	      host_no - host number to return information for
  *	      inout   - 0 for reading, 1 for writing.
  * Returns  : length of data written to buffer.
  */
 int powertecscsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset,
-			    int length, int host_no, int inout)
+			    int length, int inout)
 {
 	struct powertec_info *info;
 	char *p = buffer;
 	int pos;
 
-	If (inout == 1)
+	if (inout == 1)
 		return powertecscsi_set_proc_info(host, buffer, length);
 
 	info = (struct powertec_info *)host->hostdata;