From f2ba3bafa290c8ead4cb2d8dcc54d5418a0a1d93 Mon Sep 17 00:00:00 2001
From: Vasu Dev <vasu.dev@intel.com>
Date: Tue, 17 Mar 2009 11:42:13 -0700
Subject: [PATCH] --- yaml --- r: 142101 b: refs/heads/master c:
 9b34ecffd59d6ed66fdd6906e8a092a33e7c8564 h: refs/heads/master i:   142099:
 c5a6f16ff01e6130dbe063eee374c097b5730940 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/scsi/Kconfig        |  8 +++++++-
 trunk/drivers/scsi/Makefile       |  1 +
 trunk/drivers/scsi/fcoe/Makefile  |  1 +
 trunk/drivers/scsi/fcoe/fcoe.c    |  2 +-
 trunk/drivers/scsi/fcoe/libfcoe.c | 24 ++++++++++++++++++++++++
 trunk/drivers/scsi/libfc/fc_fcp.c |  2 +-
 7 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 trunk/drivers/scsi/fcoe/libfcoe.c

diff --git a/[refs] b/[refs]
index cb2392b03cab..4c0ebde21faf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a703e490f5e86ddaac4086e56b669fa7316b4a9f
+refs/heads/master: 9b34ecffd59d6ed66fdd6906e8a092a33e7c8564
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
index e2f44e6c0bcb..bbec3a814ea7 100644
--- a/trunk/drivers/scsi/Kconfig
+++ b/trunk/drivers/scsi/Kconfig
@@ -614,10 +614,16 @@ config LIBFC
 	---help---
 	  Fibre Channel library module
 
+config LIBFCOE
+	tristate "LibFCoE module"
+	select LIBFC
+	---help---
+	  Library for Fibre Channel over Ethernet module
+
 config FCOE
 	tristate "FCoE module"
 	depends on PCI
-	select LIBFC
+	select LIBFCOE
 	---help---
 	  Fibre Channel over Ethernet module
 
diff --git a/trunk/drivers/scsi/Makefile b/trunk/drivers/scsi/Makefile
index cf7929634668..e7c861ac417d 100644
--- a/trunk/drivers/scsi/Makefile
+++ b/trunk/drivers/scsi/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_SCSI_SRP_ATTRS)	+= scsi_transport_srp.o
 obj-$(CONFIG_SCSI_DH)		+= device_handler/
 
 obj-$(CONFIG_LIBFC)		+= libfc/
+obj-$(CONFIG_LIBFCOE)		+= fcoe/
 obj-$(CONFIG_FCOE)		+= fcoe/
 obj-$(CONFIG_ISCSI_TCP) 	+= libiscsi.o	libiscsi_tcp.o iscsi_tcp.o
 obj-$(CONFIG_INFINIBAND_ISER) 	+= libiscsi.o
diff --git a/trunk/drivers/scsi/fcoe/Makefile b/trunk/drivers/scsi/fcoe/Makefile
index 9b590ef170c0..950f27615c76 100644
--- a/trunk/drivers/scsi/fcoe/Makefile
+++ b/trunk/drivers/scsi/fcoe/Makefile
@@ -1 +1,2 @@
 obj-$(CONFIG_FCOE) += fcoe.o
+obj-$(CONFIG_LIBFCOE) += libfcoe.o
diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c
index a81a8ec3908e..23983c789429 100644
--- a/trunk/drivers/scsi/fcoe/fcoe.c
+++ b/trunk/drivers/scsi/fcoe/fcoe.c
@@ -70,7 +70,7 @@ static int debug_fcoe;
 
 MODULE_AUTHOR("Open-FCoE.org");
 MODULE_DESCRIPTION("FCoE");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 
 /* fcoe host list */
 LIST_HEAD(fcoe_hostlist);
diff --git a/trunk/drivers/scsi/fcoe/libfcoe.c b/trunk/drivers/scsi/fcoe/libfcoe.c
new file mode 100644
index 000000000000..17acbcc025aa
--- /dev/null
+++ b/trunk/drivers/scsi/fcoe/libfcoe.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright(c) 2009 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+
+#include <linux/module.h>
+
+MODULE_AUTHOR("Open-FCoE.org");
+MODULE_DESCRIPTION("FCoE");
+MODULE_LICENSE("GPL v2");
diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c
index 0997e8b1dcea..f555ae99ad40 100644
--- a/trunk/drivers/scsi/libfc/fc_fcp.c
+++ b/trunk/drivers/scsi/libfc/fc_fcp.c
@@ -41,7 +41,7 @@
 
 MODULE_AUTHOR("Open-FCoE.org");
 MODULE_DESCRIPTION("libfc");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 
 static int fc_fcp_debug;