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

mariux64 · Nov 14, 2005 · cbc7495 · cbc7495
2 parents 71f95cf + 69177e8
commit cbc7495
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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>