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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
scsi
/
arm
/
powertec.c
diff --git
a/drivers/scsi/arm/powertec.c
b/drivers/scsi/arm/powertec.c
index
3113bdc
..
ce159c1
100644
(file)
--- a/
drivers/scsi/arm/powertec.c
+++ b/
drivers/scsi/arm/powertec.c
@@
-112,10
+112,8
@@
powertecscsi_terminator_ctl(struct Scsi_Host *host, int on_off)
* Purpose : handle interrupts from Powertec SCSI card
* Params : irq - interrupt number
* dev_id - user-defined (Scsi_Host structure)
* Purpose : handle interrupts from Powertec SCSI card
* Params : irq - interrupt number
* dev_id - user-defined (Scsi_Host structure)
- * regs - processor registers at interrupt
*/
*/
-static irqreturn_t
-powertecscsi_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t powertecscsi_intr(int irq, void *dev_id)
{
struct powertec_info *info = dev_id;
{
struct powertec_info *info = dev_id;
@@
-373,7
+371,7
@@
powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_free;
ret = request_irq(ec->irq, powertecscsi_intr,
goto out_free;
ret = request_irq(ec->irq, powertecscsi_intr,
-
SA_INTERRUPT
, "powertec", info);
+
IRQF_DISABLED
, "powertec", info);
if (ret) {
printk("scsi%d: IRQ%d not free: %d\n",
host->host_no, ec->irq, ret);
if (ret) {
printk("scsi%d: IRQ%d not free: %d\n",
host->host_no, ec->irq, ret);
@@
-466,6
+464,6
@@
module_exit(powertecscsi_exit);
MODULE_AUTHOR("Russell King");
MODULE_DESCRIPTION("Powertec SCSI driver");
MODULE_AUTHOR("Russell King");
MODULE_DESCRIPTION("Powertec SCSI driver");
-
MODULE_PARM(term, "1-8i"
);
+
module_param_array(term, int, NULL, 0
);
MODULE_PARM_DESC(term, "SCSI bus termination");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(term, "SCSI bus termination");
MODULE_LICENSE("GPL");