From acaee98945ace94e7e75f5fadc79577ce5098d31 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@com.rmk.(none)>
Date: Thu, 16 Jun 2005 18:01:11 +0100
Subject: [PATCH] --- yaml --- r: 2007 b: refs/heads/master c:
 90ef713b6368dcfe7a74bcc0026b998b4c44d5bc h: refs/heads/master i:   2005:
 0402aac1a2aef606eec2aa9fd2e0842e9530f1af   2003:
 952acaa6db8c7c4b2b2ba028cf7eae68a60e248a   1999:
 f9efb4c99435a8c74611ce837a235fefcfc67749 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-versatile/core.c | 2 +-
 trunk/drivers/block/elevator.c       | 9 ++++++++-
 trunk/drivers/ieee1394/sbp2.c        | 3 +--
 trunk/drivers/input/mouse/alps.c     | 2 +-
 trunk/drivers/usb/net/kaweth.c       | 2 +-
 trunk/fs/binfmt_elf.c                | 2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 989b276fbbed..2edbc0efff2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c081474c184b34136e09e1e335f41356a11c7b68
+refs/heads/master: 90ef713b6368dcfe7a74bcc0026b998b4c44d5bc
diff --git a/trunk/arch/arm/mach-versatile/core.c b/trunk/arch/arm/mach-versatile/core.c
index 554e1bd30d6e..302c2a7b9b63 100644
--- a/trunk/arch/arm/mach-versatile/core.c
+++ b/trunk/arch/arm/mach-versatile/core.c
@@ -543,7 +543,7 @@ static void versatile_clcd_enable(struct clcd_fb *fb)
 		val |= SYS_CLCD_MODE_5551;
 		break;
 	case 6:
-		val |= SYS_CLCD_MODE_565_BLSB;
+		val |= SYS_CLCD_MODE_565_RLSB;
 		break;
 	case 8:
 		val |= SYS_CLCD_MODE_888;
diff --git a/trunk/drivers/block/elevator.c b/trunk/drivers/block/elevator.c
index 89982925f9e2..6b79b4314622 100644
--- a/trunk/drivers/block/elevator.c
+++ b/trunk/drivers/block/elevator.c
@@ -220,6 +220,11 @@ void elevator_exit(elevator_t *e)
 	kfree(e);
 }
 
+static int elevator_global_init(void)
+{
+	return 0;
+}
+
 int elv_merge(request_queue_t *q, struct request **req, struct bio *bio)
 {
 	elevator_t *e = q->elevator;
@@ -317,7 +322,7 @@ void __elv_add_request(request_queue_t *q, struct request *rq, int where,
 			int nrq = q->rq.count[READ] + q->rq.count[WRITE]
 				  - q->in_flight;
 
-			if (nrq >= q->unplug_thresh)
+			if (nrq == q->unplug_thresh)
 				__generic_unplug_device(q);
 		}
 	} else
@@ -687,6 +692,8 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name)
 	return len;
 }
 
+module_init(elevator_global_init);
+
 EXPORT_SYMBOL(elv_add_request);
 EXPORT_SYMBOL(__elv_add_request);
 EXPORT_SYMBOL(elv_requeue_request);
diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c
index ab82d6addd7f..00c7b958361a 100644
--- a/trunk/drivers/ieee1394/sbp2.c
+++ b/trunk/drivers/ieee1394/sbp2.c
@@ -745,8 +745,7 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
 	list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids);
 
 	/* Register our host with the SCSI stack. */
-	scsi_host = scsi_host_alloc(&scsi_driver_template,
-				    sizeof (unsigned long));
+	scsi_host = scsi_host_alloc(&scsi_driver_template, 0);
 	if (!scsi_host) {
 		SBP2_ERR("failed to register scsi host");
 		goto failed_alloc;
diff --git a/trunk/drivers/input/mouse/alps.c b/trunk/drivers/input/mouse/alps.c
index 7bf4be733e9a..42a9f7f6f8cb 100644
--- a/trunk/drivers/input/mouse/alps.c
+++ b/trunk/drivers/input/mouse/alps.c
@@ -352,7 +352,7 @@ static int alps_reconnect(struct psmouse *psmouse)
 	if (alps_get_status(psmouse, param))
 		return -1;
 
-	if (!(param[0] & 0x04))
+	if (param[0] & 0x04)
 		alps_tap_mode(psmouse, 1);
 
 	if (alps_absolute_mode(psmouse)) {
diff --git a/trunk/drivers/usb/net/kaweth.c b/trunk/drivers/usb/net/kaweth.c
index fd6ff4cb2c62..a9a7cf4a38eb 100644
--- a/trunk/drivers/usb/net/kaweth.c
+++ b/trunk/drivers/usb/net/kaweth.c
@@ -520,7 +520,7 @@ static void int_callback(struct urb *u, struct pt_regs *regs)
 
 	/* we check the link state to report changes */
 	if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) {
-		if (act_state)
+		if (!act_state)
 			netif_carrier_on(kaweth->net);
 		else
 			netif_carrier_off(kaweth->net);
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
index f8f6b6b76179..c374be51b041 100644
--- a/trunk/fs/binfmt_elf.c
+++ b/trunk/fs/binfmt_elf.c
@@ -1125,7 +1125,7 @@ static int dump_write(struct file *file, const void *addr, int nr)
 	return file->f_op->write(file, addr, nr, &file->f_pos) == nr;
 }
 
-static int dump_seek(struct file *file, loff_t off)
+static int dump_seek(struct file *file, off_t off)
 {
 	if (file->f_op->llseek) {
 		if (file->f_op->llseek(file, off, 0) != off)