From: David S. Miller <davem@davemloft.net>
Date: Tue, 27 Oct 2009 08:03:26 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.33-rc1~388^2~701
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=cfadf853f6cd9689f79a63ca960c6f9d6665314f;p=karo-tx-linux.git

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

Conflicts:
	drivers/net/sh_eth.c
---

cfadf853f6cd9689f79a63ca960c6f9d6665314f
diff --cc drivers/net/sh_eth.c
index 161181a4b3d6,528b912a4b0d..5783f50d18e9
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@@ -30,7 -30,8 +30,9 @@@
  #include <linux/phy.h>
  #include <linux/cache.h>
  #include <linux/io.h>
 +#include <linux/pm_runtime.h>
+ #include <asm/cacheflush.h>
+ 
  #include "sh_eth.h"
  
  /* There is CPU dependent code */