diff options
| author | David S. Miller | 2009-06-15 12:02:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-06-15 12:02:23 +0200 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /net/core/dev.c | |
| parent | pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kb... (diff) | |
| download | kernel-qcow2-linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.tar.gz kernel-qcow2-linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.tar.xz kernel-qcow2-linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ea00e36f48e1..576a61574a93 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -126,7 +126,7 @@ #include <linux/in.h> #include <linux/jhash.h> #include <linux/random.h> -#include <trace/napi.h> +#include <trace/events/napi.h> #include "net-sysfs.h" |