commit 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb
author David S. Miller <davem@davemloft.net> Mon Jun 15 03:02:23 2009 -0700
committer David S. Miller <davem@davemloft.net> Mon Jun 15 03:02:23 2009 -0700
tree 8d104ec2a459346b99413b0b77421ca7b9936c1a
parent ca44d6e60f9de26281fda203f58b570e1748c015
parent 45e3e1935e2857c54783291107d33323b3ef33c8

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

net/core/dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index ea00e36..576a615 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"