summaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-23 17:56:23 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-23 17:56:23 -0800
commit6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch)
treed98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /drivers/net/jme.h
parent908a7a16b852ffd618a9127be8d62432182d81b4 (diff)
parent739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff)
downloadop-kernel-dev-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.zip
op-kernel-dev-6332178d91ca1a9dbd99bd97cabbcf965d178e9f.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ppp_generic.c
Diffstat (limited to 'drivers/net/jme.h')
-rw-r--r--drivers/net/jme.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index 2d6f30e..5154411 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -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"
OpenPOWER on IntegriCloud