[Xen-devel] [PATCH 11/11] makefile and kconfig entries

[Mitch Williams <mitch.a.williams@xxxxxxxxx>]

Wire the source files into the kernel build system.  This creates a
new CONFIG_IXGBE option to build the driver.  We also modify the text
for the older ixgb driver to call out that it is only for PCI-X boards
and that people should use ixgbe for PCI-Express boards.

Signed-off-by: Mitch Williams <mitch.a.williams@xxxxxxxxx>

diff -urpN -X dontdiff a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile
--- a/drivers/net/ixgbe/Makefile        1969-12-31 16:00:00.000000000 -0800
+++ b/drivers/net/ixgbe/Makefile        2009-01-22 14:36:13.000000000 -0800
@@ -0,0 +1,11 @@
+#
+# Makefile for the Intel(R) 10GbE PCI Express ethernet driver
+#
+
+obj-$(CONFIG_IXGBE) += ixgbe.o
+
+ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
+              ixgbe_82598.o ixgbe_phy.o ixgbe_api.o ixgbe_dcb_82598.o \
+              ixgbe_dcb.o ixgbe_param.o ixgbe_phy.o kcompat.o
+EXTRA_CFLAGS += -DDRIVER_IXGBE -DCONFIG_IXGBE_RSS
+
diff -urpN -X dontdiff a/drivers/net/Kconfig b/drivers/net/Kconfig
--- a/drivers/net/Kconfig       2009-01-23 11:17:02.000000000 -0800
+++ b/drivers/net/Kconfig       2009-01-23 11:18:04.000000000 -0800
@@ -2318,12 +2318,31 @@ config CHELSIO_T1
           To compile this driver as a module, choose M here: the module
           will be called cxgb.

+config IXGBE
+       tristate "Intel(R) 10GbE PCI Express adapters support"
+       depends on PCI && INET
+       ---help---
+         This driver supports Intel(R) 10GbE PCI Express family of
+         adapters.  For more information on how to identify your adapter, go
+         to the Adapter & Driver ID Guide at:
+
+         <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+         For general information and support, go to the Intel support
+         website at:
+
+         <http://support.intel.com>
+
+         To compile this driver as a module, choose M here. The module
+         will be called ixgbe.
+
 config IXGB
        tristate "Intel(R) PRO/10GbE support"
        depends on PCI
        ---help---
-         This driver supports Intel(R) PRO/10GbE family of
-         adapters.  For more information on how to identify your adapter, go
+         This driver supports Intel(R) PRO/10GbE family of adapters for
+         PCI-X type cards. For PCI-E type cards, use the "ixgbe" driver
+         instead. For more information on how to identify your adapter, go
          to the Adapter & Driver ID Guide at:

          <http://support.intel.com/support/network/adapter/pro100/21397.htm>
@@ -2336,8 +2355,7 @@ config IXGB
          More specific information on configuring the driver is in
          <file:Documentation/networking/ixgb.txt>.

-         To compile this driver as a module, choose M here and read
-         <file:Documentation/networking/net-modules.txt>.  The module
+         To compile this driver as a module, choose M here. The module
          will be called ixgb.

 config IXGB_NAPI
diff -urpN -X dontdiff a/drivers/net/Makefile b/drivers/net/Makefile
--- a/drivers/net/Makefile      2009-01-23 11:17:02.000000000 -0800
+++ b/drivers/net/Makefile      2009-01-22 13:38:53.000000000 -0800
@@ -9,6 +9,7 @@ endif
 obj-$(CONFIG_E1000) += e1000/
 obj-$(CONFIG_IBM_EMAC) += ibm_emac/
 obj-$(CONFIG_IXGB) += ixgb/
+obj-$(CONFIG_IXGBE) += ixgbe/
 obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel