diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/asm-arm/mach/mmc.h | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/mach/mmc.h')
| -rw-r--r-- | include/asm-arm/mach/mmc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/mach/mmc.h b/include/asm-arm/mach/mmc.h index 1b3555d4b41e..eb91145c00c4 100644 --- a/include/asm-arm/mach/mmc.h +++ b/include/asm-arm/mach/mmc.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #ifndef ASMARM_MACH_MMC_H | 4 | #ifndef ASMARM_MACH_MMC_H |
| 5 | #define ASMARM_MACH_MMC_H | 5 | #define ASMARM_MACH_MMC_H |
| 6 | 6 | ||
| 7 | #include <linux/mmc/protocol.h> | 7 | #include <linux/mmc/host.h> |
| 8 | 8 | ||
| 9 | struct mmc_platform_data { | 9 | struct mmc_platform_data { |
| 10 | unsigned int ocr_mask; /* available voltages */ | 10 | unsigned int ocr_mask; /* available voltages */ |