Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:45:22 +0000 (10:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:45:22 +0000 (10:45 -0800)
1  2 
drivers/mmc/mmci.c

index 2b10a2d4ae099f9a7c1d44829c54b80431c862f4,a0cd916ab7920805da9edcefd7ba6a34b5d25ed1..634ef53e85a50e63bbb52a5ae3008c7297a73f5d
  #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>