diff --git a/[refs] b/[refs]
index d56b49500156..cfa58e7fe51e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bbfd39bb9a5623cb8e0bcc54aee9b43d9ee97b9
+refs/heads/master: 5cb02ff3489d710c73b4a21bb804feedeacce116
diff --git a/trunk/drivers/scsi/fdomain.c b/trunk/drivers/scsi/fdomain.c
index c33bcb284df7..56f4e6bffc21 100644
--- a/trunk/drivers/scsi/fdomain.c
+++ b/trunk/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 $"