diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-03-06 12:18:25 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-03-06 12:18:25 +0000 |
commit | 5853e7427858a9ae493ea4999ef1069d2e2550d9 (patch) | |
tree | 6084c4e69950f812e2849c6ec3877f867fdc5b53 /include/asm-arm/arch-omap/board-h3.h | |
parent | [ARM] AT91: correct at91sam9263ek LCD power gpio pin (diff) | |
parent | ARM: OMAP2: Register the L4 io bus to boot OMAP2 (diff) | |
download | linux-dev-5853e7427858a9ae493ea4999ef1069d2e2550d9.tar.xz linux-dev-5853e7427858a9ae493ea4999ef1069d2e2550d9.zip |
Merge branch 'omap-fixes'
* omap-fixes:
ARM: OMAP2: Register the L4 io bus to boot OMAP2
ARM: OMAP1: Compile in other 16xx boards to OSK defconfig
ARM: OMAP1: Refresh H2 defconfig
ARM: OMAP1: Refresh OSK defconfig
ARM: OMAP: gpio lockdep updates
ARM: OMAP1: omap1/pm.c build fix
ARM: OMAP1: omap h2 regression fix
ARM: OMAP1: Fix compile for boards depending on old gpio expander
ARM: OMAP1: omap h3 regression and build fix
ARM: OMAP: Remove compiler warning when i2c is not set
ARM: OMAP: fix omap i2c init (regression)
ARM: OMAP: fix false lockdep warnings
ARM: OMAP: Fix sleep under spinlock for cpufreq
ARM: OMAP: Pass logical DMA channel number always to callback handlers
Diffstat (limited to 'include/asm-arm/arch-omap/board-h3.h')
-rw-r--r-- | include/asm-arm/arch-omap/board-h3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/board-h3.h b/include/asm-arm/arch-omap/board-h3.h index 1c2b55c61ca0..0f6404435ea8 100644 --- a/include/asm-arm/arch-omap/board-h3.h +++ b/include/asm-arm/arch-omap/board-h3.h @@ -36,7 +36,7 @@ #define NR_IRQS (MAXIRQNUM + 1) -extern void __init h3_mmc_init(void); +extern void h3_mmc_init(void); extern void h3_mmc_slot_cover_handler(void *arg, int state); #endif /* __ASM_ARCH_OMAP_H3_H */ |