summaryrefslogtreecommitdiff
path: root/drivers/mmc/pxamci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:47:00 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:47:00 -0800
commitfc8e3d177fa8073895d37b50282489dbeec89eb1 (patch)
tree3e8acd6338bad172486b718647ed3dc1d412dcc9 /drivers/mmc/pxamci.c
parentad2c1604da74a3bbef96e7259e389ccba0cf613a (diff)
parent936d8592654bb97d5706a73c0e2a6339b090f7fb (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/pxamci.c')
-rw-r--r--drivers/mmc/pxamci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 8eba373d42d7..d575e3a018bc 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -29,7 +29,6 @@
#include <asm/dma.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/scatterlist.h>
#include <asm/sizes.h>