From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 25 Oct 2010 08:00:30 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-linus
X-Git-Tag: v2.6.37-rc1~126^2~1
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=aa5c14d5c0d3e4c587db4a1b220b9c86415c538f;p=net-next-2.6.git

Merge branch 'topic/asoc' into for-linus

Conflicts:
	arch/powerpc/platforms/85xx/p1022_ds.c
---

aa5c14d5c0d3e4c587db4a1b220b9c86415c538f
diff --cc arch/powerpc/platforms/85xx/p1022_ds.c
index 34e00902ce8,e984d4ea351..e15afdf1234
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@@ -19,8 -18,9 +18,8 @@@
  
  #include <linux/pci.h>
  #include <linux/of_platform.h>
 -#include <linux/lmb.h>
  #include <linux/memblock.h>
- 
+ #include <asm/div64.h>
  #include <asm/mpic.h>
  #include <asm/swiotlb.h>