diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/mmc | |
| parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
| parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) | |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 3b2085b57769..fcc98a4cce3c 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <mach/regs-sdi.h> | 25 | #include <mach/regs-sdi.h> |
| 26 | #include <mach/regs-gpio.h> | 26 | #include <mach/regs-gpio.h> |
| 27 | 27 | ||
| 28 | #include <asm/plat-s3c24xx/mci.h> | 28 | #include <plat/mci.h> |
| 29 | 29 | ||
| 30 | #include "s3cmci.h" | 30 | #include "s3cmci.h" |
| 31 | 31 | ||