From 278afb43b711656648e0a44fe00e06a371f2626e Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Thu, 16 Jun 2005 12:56:15 +0200
Subject: [PATCH] --- yaml --- r: 2004 b: refs/heads/master c:
 9c56187d3c345cc0e7a2f162b8c32543175d7bf7 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/elevator.c   | 7 -------
 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 +-
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9ce25af3c019..60e2c2b4c6de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58125f95c62a44f12bb71c58ef70f0068d20c7a2
+refs/heads/master: 9c56187d3c345cc0e7a2f162b8c32543175d7bf7
diff --git a/trunk/drivers/block/elevator.c b/trunk/drivers/block/elevator.c
index 6b79b4314622..98fcabbafe1e 100644
--- a/trunk/drivers/block/elevator.c
+++ b/trunk/drivers/block/elevator.c
@@ -220,11 +220,6 @@ 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;
@@ -692,8 +687,6 @@ 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)