diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 02:48:18 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-26 02:48:18 +0100 |
| commit | 6253195b671b98a4e5da5d39c2df9f8f257bcea1 (patch) | |
| tree | 3b7ca1d8ef5d9c50a77abf1d1cf5b2b5aa243284 /drivers/mmc | |
| parent | Merge branch 'sh/sdhi-mfd' (diff) | |
| parent | sh: Check for return_to_handler when unwinding the stack (diff) | |
| download | linux-6253195b671b98a4e5da5d39c2df9f8f257bcea1.tar.xz linux-6253195b671b98a4e5da5d39c2df9f8f257bcea1.zip | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/at91_mci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index e556d42cc45a..63924e0c7ea9 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c @@ -72,7 +72,6 @@ #include <asm/irq.h> #include <asm/gpio.h> -#include <asm/mach/mmc.h> #include <mach/board.h> #include <mach/cpu.h> #include <mach/at91_mci.h> |