[XFS] Fix merge failures

[pandora-kernel.git] / drivers / net / enic / enic.h

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 7f677e8..a832cc5 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -33,7 +33,7 @@
 
 #define DRV_NAME               "enic"
 #define DRV_DESCRIPTION                "Cisco 10G Ethernet Driver"
-#define DRV_VERSION            "0.0.1-18163.472-k1"
+#define DRV_VERSION            "1.0.0.648"
 #define DRV_COPYRIGHT          "Copyright 2008 Cisco Systems, Inc"
 #define PFX                    DRV_NAME ": "