TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/ppp_generic.c
This commit is contained in:
David S. Miller
2008-12-23 17:56:23 -08:00
parent 908a7a16b8 739840d529
commit 6332178d91
8 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/jme.h
View File

@@ -22,7 +22,7 @@
*/
#ifndef __JME_H_INCLUDED__
#define __JME_H_INCLUDEE__
#define __JME_H_INCLUDED__
#define DRV_NAME "jme"
#define DRV_VERSION "1.0.3"