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

cbc74951 · Linus Torvalds · 71f95cfb · 69177e89 · cbc74951
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

drivers/mmc/mmci.c drivers/mmc/mmci.c +0 -1

未找到文件。
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -22,7 +22,6 @@

 #include <asm/div64.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/scatterlist.h>
 #include <asm/sizes.h>
 #include <asm/hardware/amba.h>