diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /drivers/mmc/host/s3cmci.c | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'drivers/mmc/host/s3cmci.c')
| -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 fcc98a4cce3..35a98eec741 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -20,7 +20,7 @@ #include <linux/irq.h> #include <linux/io.h> -#include <asm/dma.h> +#include <mach/dma.h> #include <mach/regs-sdi.h> #include <mach/regs-gpio.h> |