diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:47:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:47:00 -0500 |
| commit | fc8e3d177fa8073895d37b50282489dbeec89eb1 (patch) | |
| tree | 3e8acd6338bad172486b718647ed3dc1d412dcc9 /drivers/mmc/pxamci.c | |
| parent | ad2c1604da74a3bbef96e7259e389ccba0cf613a (diff) | |
| parent | 936d8592654bb97d5706a73c0e2a6339b090f7fb (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/pxamci.c')
| -rw-r--r-- | drivers/mmc/pxamci.c | 1 |
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 @@ | |||
| 29 | 29 | ||
| 30 | #include <asm/dma.h> | 30 | #include <asm/dma.h> |
| 31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 32 | #include <asm/irq.h> | ||
| 33 | #include <asm/scatterlist.h> | 32 | #include <asm/scatterlist.h> |
| 34 | #include <asm/sizes.h> | 33 | #include <asm/sizes.h> |
| 35 | 34 | ||