git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/usb-audio' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
atlx
/
atl1.c
diff --git
a/drivers/net/atlx/atl1.c
b/drivers/net/atlx/atl1.c
index
0ab2254
..
4e81712
100644
(file)
--- a/
drivers/net/atlx/atl1.c
+++ b/
drivers/net/atlx/atl1.c
@@
-82,6
+82,12
@@
#include "atl1.h"
#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"
/* Temporary hack for merging atl1 and atl2 */
#include "atlx.c"