]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 25 Oct 2010 08:00:30 +0000 (10:00 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 25 Oct 2010 08:00:30 +0000 (10:00 +0200)
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c

1  2 
arch/powerpc/platforms/85xx/p1022_ds.c
sound/soc/davinci/davinci-sffsdr.c
sound/soc/s3c24xx/neo1973_gta02_wm8753.c
sound/soc/s3c24xx/neo1973_wm8753.c
sound/soc/s3c24xx/s3c-dma.c

index 34e00902ce86229bf7aafe28eb5e5c9ae4a632e0,e984d4ea351a495c844682d0f871c1fa276e27a1..e15afdf123432b01bd2d51abc8a857cc26c2d7f5
@@@ -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>
  
Simple merge
Simple merge
Simple merge