diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
commit | d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de (patch) | |
tree | 1e8c402df9b1154f4ca37eb5242f960ef7aab747 /drivers/mmc/host/s3cmci.c | |
parent | ALSA: Add missing KERN_* prefix to printk in other sound/* (diff) | |
parent | ALSA: Add subdevice_mask field to quirk entries (diff) | |
download | linux-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.tar.xz linux-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.zip |
Merge branch 'topic/quirk-cleanup' into topic/misc
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 fcc98a4cce3c..35a98eec7414 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> |