diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-20 11:50:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-20 11:50:49 -0400 |
| commit | 9600c11ba3602be161cd376f1460f3de561fc299 (patch) | |
| tree | d071c2427a8f7ad601aec6d8ae76b0f61410becf /drivers/scsi/ibmmca.c | |
| parent | 676d55ae30ea3b688f0386f70553489f25f24d55 (diff) | |
| parent | 13e1e1f08c1c098c7574c1fa72bd8c67792dc89b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
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; |