From 5c9568abc515e9d08d0de6699bfea0932c3c8762 Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Tue, 26 May 2009 20:50:12 -0700
Subject: [PATCH] --- yaml --- r: 145437 b: refs/heads/master c:
 5ad18900355743757e7f415bcb850ea8406a13e2 h: refs/heads/master i:   145435:
 63d03c9b28ce423c6d04293ab3bd937268eb715e v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/atlx/atl1.c | 6 ++++++
 trunk/drivers/net/atlx/atlx.h | 6 ------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ab5b5c40824a..cd57efc9b94e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18a36c1a398055e87a3646738abf3c1b0e98e7e2
+refs/heads/master: 5ad18900355743757e7f415bcb850ea8406a13e2
diff --git a/trunk/drivers/net/atlx/atl1.c b/trunk/drivers/net/atlx/atl1.c
index 0ab22540bf59..4e817126e280 100644
--- a/trunk/drivers/net/atlx/atl1.c
+++ b/trunk/drivers/net/atlx/atl1.c
@@ -82,6 +82,12 @@
 
 #include "atl1.h"
 
+#define ATLX_DRIVER_VERSION "2.1.3"
+MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \
+	Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(ATLX_DRIVER_VERSION);
+
 /* Temporary hack for merging atl1 and atl2 */
 #include "atlx.c"
 
diff --git a/trunk/drivers/net/atlx/atlx.h b/trunk/drivers/net/atlx/atlx.h
index 297a03da6b7f..14054b75aa62 100644
--- a/trunk/drivers/net/atlx/atlx.h
+++ b/trunk/drivers/net/atlx/atlx.h
@@ -29,12 +29,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 
-#define ATLX_DRIVER_VERSION "2.1.3"
-MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \
-	Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(ATLX_DRIVER_VERSION);
-
 #define ATLX_ERR_PHY			2
 #define ATLX_ERR_PHY_SPEED		7
 #define ATLX_ERR_PHY_RES		8