Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / drivers / net / sky2.c

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index e86ca3d408494468346144b0c460af2cb6564cc2..f2ab3d56e5653663040190dd91dcdfbc3e38ed70 100644 (file)
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -49,7 +49,7 @@
 #include "sky2.h"
 
 #define DRV_NAME               "sky2"
-#define DRV_VERSION            "1.11.1"
+#define DRV_VERSION            "1.12"
 #define PFX                    DRV_NAME " "
 
 /*