diff options
| author | Alan Cox <alan@redhat.com> | 2008-10-05 17:39:16 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-10-17 23:07:38 +0200 |
| commit | 5cb02ff3489d710c73b4a21bb804feedeacce116 (patch) | |
| tree | adf43f2e4639ef4d3ea3d982a12896fee22d8a6e /drivers/scsi/fdomain.c | |
| parent | 7bbfd39bb9a5623cb8e0bcc54aee9b43d9ee97b9 (diff) | |
| download | linux-stable-5cb02ff3489d710c73b4a21bb804feedeacce116.tar.gz linux-stable-5cb02ff3489d710c73b4a21bb804feedeacce116.tar.bz2 linux-stable-5cb02ff3489d710c73b4a21bb804feedeacce116.zip | |
fdomain_cs: Sort out modules with duplicate description
The PCMCIA one provides its own description so in PCMCIA mode we should use
that.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/scsi/fdomain.c')
| -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 @@ #include <scsi/scsi_ioctl.h> #include "fdomain.h" +#ifndef PCMCIA MODULE_AUTHOR("Rickard E. Faith"); MODULE_DESCRIPTION("Future domain SCSI driver"); MODULE_LICENSE("GPL"); +#endif #define VERSION "$Revision: 5.51 $" |