diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 21:48:18 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-25 21:48:18 -0400 |
| commit | 6253195b671b98a4e5da5d39c2df9f8f257bcea1 (patch) | |
| tree | 3b7ca1d8ef5d9c50a77abf1d1cf5b2b5aa243284 /drivers/mmc | |
| parent | 15893fb565921507da80e500d85bb2575989bb57 (diff) | |
| parent | 60339fad5c68c9c533cd14e67194ff8f727c41d9 (diff) | |
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 @@ | |||
| 72 | #include <asm/irq.h> | 72 | #include <asm/irq.h> |
| 73 | #include <asm/gpio.h> | 73 | #include <asm/gpio.h> |
| 74 | 74 | ||
| 75 | #include <asm/mach/mmc.h> | ||
| 76 | #include <mach/board.h> | 75 | #include <mach/board.h> |
| 77 | #include <mach/cpu.h> | 76 | #include <mach/cpu.h> |
| 78 | #include <mach/at91_mci.h> | 77 | #include <mach/at91_mci.h> |