From: Alan Cox <alan@redhat.com>
Date: Sun, 5 Oct 2008 16:39:16 +0000 (+0100)
Subject: fdomain_cs: Sort out modules with duplicate description
X-Git-Tag: v2.6.28-rc3~37^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5cb02ff3489d710c73b4a21bb804feedeacce116;p=linux-2.6-omap-h63xx.git

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>
---

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 $"