aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:16:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:16:56 -0800
commitcbc749518235b0f1dacb867c8c25059a1b876276 (patch)
tree83ebc2ab3c9e2407fc3939cd266fca454eac3965 /drivers
parent71f95cfbcfc31ba0d002ddb6e37ca5a0b5eaf02c (diff)
parent69177e890cd43e781c3aa9eed98ea091c4cb0788 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/mmci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 1e6bdba2675..166c9b0ad04 100644
--- 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>