diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /include/asm-arm/arch-omap/menelaus.h | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/arch-omap/menelaus.h')
| -rw-r--r-- | include/asm-arm/arch-omap/menelaus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/menelaus.h b/include/asm-arm/arch-omap/menelaus.h index 46be8b8d6346..88cd4c87f0de 100644 --- a/include/asm-arm/arch-omap/menelaus.h +++ b/include/asm-arm/arch-omap/menelaus.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #ifndef __ASM_ARCH_MENELAUS_H | 7 | #ifndef __ASM_ARCH_MENELAUS_H |
| 8 | #define __ASM_ARCH_MENELAUS_H | 8 | #define __ASM_ARCH_MENELAUS_H |
| 9 | 9 | ||
| 10 | extern void menelaus_mmc_register(void (*callback)(u8 card_mask), | 10 | extern void menelaus_mmc_register(void (*callback)(unsigned long data, u8 card_mask), |
| 11 | unsigned long data); | 11 | unsigned long data); |
| 12 | extern void menelaus_mmc_remove(void); | 12 | extern void menelaus_mmc_remove(void); |
| 13 | extern void menelaus_mmc_opendrain(int enable); | 13 | extern void menelaus_mmc_opendrain(int enable); |