git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[pandora-kernel.git]
/
drivers
/
scsi
/
sun3_scsi_vme.c
diff --git
a/drivers/scsi/sun3_scsi_vme.c
b/drivers/scsi/sun3_scsi_vme.c
index
bb0c9fd
..
aaa4fd0
100644
(file)
--- a/
drivers/scsi/sun3_scsi_vme.c
+++ b/
drivers/scsi/sun3_scsi_vme.c
@@
-20,7
+20,6
@@
#include <linux/module.h>
#include <linux/signal.h>
#include <linux/module.h>
#include <linux/signal.h>
-#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/blkdev.h>
@@
-231,7
+230,7
@@
static int sun3scsi_detect(struct scsi_host_template * tpnt)
((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
if (request_irq(instance->irq, scsi_sun3_intr,
((struct NCR5380_hostdata *)instance->hostdata)->ctrl = 0;
if (request_irq(instance->irq, scsi_sun3_intr,
-
0, "Sun3SCSI-5380VME", NULL
)) {
+
0, "Sun3SCSI-5380VME", instance
)) {
#ifndef REAL_DMA
printk("scsi%d: IRQ%d not free, interrupts disabled\n",
instance->host_no, instance->irq);
#ifndef REAL_DMA
printk("scsi%d: IRQ%d not free, interrupts disabled\n",
instance->host_no, instance->irq);
@@
-280,7
+279,7
@@
static int sun3scsi_detect(struct scsi_host_template * tpnt)
int sun3scsi_release (struct Scsi_Host *shpnt)
{
if (shpnt->irq != SCSI_IRQ_NONE)
int sun3scsi_release (struct Scsi_Host *shpnt)
{
if (shpnt->irq != SCSI_IRQ_NONE)
- free_irq
(shpnt->irq, NULL
);
+ free_irq
(shpnt->irq, shpnt
);
iounmap((void *)sun3_scsi_regp);
iounmap((void *)sun3_scsi_regp);
@@
-583,3
+582,4
@@
static struct scsi_host_template driver_template = {
#include "scsi_module.c"
#include "scsi_module.c"
+MODULE_LICENSE("GPL");