summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 12:52:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 12:52:53 -0700
commitc732acd96085347027b11961463a243c568d9aab (patch)
tree5ce568eb6a31a39dfa5c5af4e10e6270383a07a2 /drivers/scsi
parent1b2d3d94ec878c3529153061cd8cceb876e01a3e (diff)
parent5cb02ff3489d710c73b4a21bb804feedeacce116 (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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index c33bcb284df..56f4e6bffc2 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 $"