diff options
| author | Tony Lindgren <tony@atomide.com> | 2006-04-02 17:46:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 17:46:27 +0100 |
| commit | 120db2cba8e40c562e5a4aea44ede2f360a5de75 (patch) | |
| tree | f08247e64219571b634faf5a809e8505fb0292f2 /include/asm-arm/arch-omap/menelaus.h | |
| parent | 0dc5e77c46c6b02e8286f17544d93d614c0cb892 (diff) | |
| download | op-kernel-dev-120db2cba8e40c562e5a4aea44ede2f360a5de75.zip op-kernel-dev-120db2cba8e40c562e5a4aea44ede2f360a5de75.tar.gz | |
[ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2
Patch from Tony Lindgren
Update misc OMAP core code from linux-omap tree:
- McBSP updates by Samuel Ortiz, Andrzej Zaborowski
- Whitespace cleanups by Ladislav Michl
- Other fixes by various linux-omap developers
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 46be8b8..88cd4c8 100644 --- a/include/asm-arm/arch-omap/menelaus.h +++ b/include/asm-arm/arch-omap/menelaus.h @@ -7,7 +7,7 @@ #ifndef __ASM_ARCH_MENELAUS_H #define __ASM_ARCH_MENELAUS_H -extern void menelaus_mmc_register(void (*callback)(u8 card_mask), +extern void menelaus_mmc_register(void (*callback)(unsigned long data, u8 card_mask), unsigned long data); extern void menelaus_mmc_remove(void); extern void menelaus_mmc_opendrain(int enable); |
