diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:52:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 15:52:53 -0400 |
| commit | c732acd96085347027b11961463a243c568d9aab (patch) | |
| tree | 5ce568eb6a31a39dfa5c5af4e10e6270383a07a2 /drivers/scsi | |
| parent | 1b2d3d94ec878c3529153061cd8cceb876e01a3e (diff) | |
| parent | 5cb02ff3489d710c73b4a21bb804feedeacce116 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
fdomain_cs: Sort out modules with duplicate description
pcmcia: Whine harder about use of EXCLUSIVE
pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/fdomain.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index c33bcb284df7..56f4e6bffc21 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c | |||
| @@ -290,9 +290,11 @@ | |||
| 290 | #include <scsi/scsi_ioctl.h> | 290 | #include <scsi/scsi_ioctl.h> |
| 291 | #include "fdomain.h" | 291 | #include "fdomain.h" |
| 292 | 292 | ||
| 293 | #ifndef PCMCIA | ||
| 293 | MODULE_AUTHOR("Rickard E. Faith"); | 294 | MODULE_AUTHOR("Rickard E. Faith"); |
| 294 | MODULE_DESCRIPTION("Future domain SCSI driver"); | 295 | MODULE_DESCRIPTION("Future domain SCSI driver"); |
| 295 | MODULE_LICENSE("GPL"); | 296 | MODULE_LICENSE("GPL"); |
| 297 | #endif | ||
| 296 | 298 | ||
| 297 | 299 | ||
| 298 | #define VERSION "$Revision: 5.51 $" | 300 | #define VERSION "$Revision: 5.51 $" |