git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
block
/
xd.c
diff --git
a/drivers/block/xd.c
b/drivers/block/xd.c
index
cbce7c5
..
0d97b7e
100644
(file)
--- a/
drivers/block/xd.c
+++ b/
drivers/block/xd.c
@@
-48,9
+48,9
@@
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/delay.h>
#include <linux/blkdev.h>
#include <linux/blkpg.h>
#include <linux/delay.h>
+#include <linux/io.h>
#include <asm/system.h>
#include <asm/system.h>
-#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/dma.h>
@@
-215,7
+215,6
@@
static int __init xd_init(void)
disk->major = XT_DISK_MAJOR;
disk->first_minor = i<<6;
sprintf(disk->disk_name, "xd%c", i+'a');
disk->major = XT_DISK_MAJOR;
disk->first_minor = i<<6;
sprintf(disk->disk_name, "xd%c", i+'a');
- sprintf(disk->devfs_name, "xd/target%d", i);
disk->fops = &xd_fops;
disk->private_data = p;
disk->queue = xd_queue;
disk->fops = &xd_fops;
disk->private_data = p;
disk->queue = xd_queue;
@@
-314,7
+313,7
@@
static void do_xd_request (request_queue_t * q)
int res = 0;
int retry;
int res = 0;
int retry;
- if (!
(req->flags & REQ_CMD
)) {
+ if (!
blk_fs_request(req
)) {
end_request(req, 0);
continue;
}
end_request(req, 0);
continue;
}
@@
-463,8
+462,7
@@
static void xd_recalibrate (u_char drive)
}
/* xd_interrupt_handler: interrupt service routine */
}
/* xd_interrupt_handler: interrupt service routine */
-static irqreturn_t xd_interrupt_handler(int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t xd_interrupt_handler(int irq, void *dev_id)
{
if (inb(XD_STATUS) & STAT_INTERRUPT) { /* check if it was our device */
#ifdef DEBUG_OTHER
{
if (inb(XD_STATUS) & STAT_INTERRUPT) { /* check if it was our device */
#ifdef DEBUG_OTHER