diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /drivers/scsi/ibmmca.c | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
Diffstat (limited to 'drivers/scsi/ibmmca.c')
| -rw-r--r-- | drivers/scsi/ibmmca.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 6e54c7d9b33c..19392f651272 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c | |||
| @@ -460,6 +460,8 @@ MODULE_PARM(adisplay, "1i"); | |||
| 460 | MODULE_PARM(normal, "1i"); | 460 | MODULE_PARM(normal, "1i"); |
| 461 | MODULE_PARM(ansi, "1i"); | 461 | MODULE_PARM(ansi, "1i"); |
| 462 | #endif | 462 | #endif |
| 463 | |||
| 464 | MODULE_LICENSE("GPL"); | ||
| 463 | #endif | 465 | #endif |
| 464 | /*counter of concurrent disk read/writes, to turn on/off disk led */ | 466 | /*counter of concurrent disk read/writes, to turn on/off disk led */ |
| 465 | static int disk_rw_in_progress = 0; | 467 | static int disk_rw_in_progress = 0; |