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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
net
/
arm
/
etherh.c
diff --git
a/drivers/net/arm/etherh.c
b/drivers/net/arm/etherh.c
index
769ba69
..
0d37d9d
100644
(file)
--- a/
drivers/net/arm/etherh.c
+++ b/
drivers/net/arm/etherh.c
@@
-31,7
+31,6
@@
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
-#include <linux/ptrace.h>
#include <linux/ioport.h>
#include <linux/in.h>
#include <linux/slab.h>