From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 7 Jan 2006 18:45:22 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8995b161eb142b843094dd614b80e4cce1d66352;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm
---

8995b161eb142b843094dd614b80e4cce1d66352
diff --cc drivers/mmc/mmci.c
index 2b10a2d4ae09,a0cd916ab792..634ef53e85a5
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@@ -19,8 -19,9 +19,10 @@@
  #include <linux/highmem.h>
  #include <linux/mmc/host.h>
  #include <linux/mmc/protocol.h>
+ #include <linux/amba/bus.h>
+ #include <linux/clk.h>
  
 +#include <asm/cacheflush.h>
  #include <asm/div64.h>
  #include <asm/io.h>
  #include <asm/scatterlist.h>