diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 16:48:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 16:48:02 +0200 |
| commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
| tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /arch/arm/mach-kirkwood | |
| parent | ARM: fix build warning in asm/elf.h (diff) | |
| parent | Merge branch 'test' of ../test/linux-2.6-lpc2 into wells/lpc32xx-arch_v2 (diff) | |
| download | linux-129961ecaf21c9ee899ad9067d917c1aa172fb7a.tar.xz linux-129961ecaf21c9ee899ad9067d917c1aa172fb7a.zip | |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/tsx1x-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x-common.h index 9a592962a6ea..7fa037361b55 100644 --- a/arch/arm/mach-kirkwood/tsx1x-common.h +++ b/arch/arm/mach-kirkwood/tsx1x-common.h @@ -1,7 +1,7 @@ #ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H #define __ARCH_KIRKWOOD_TSX1X_COMMON_H -extern void qnap_tsx1x_register_flash(void); +extern void __init qnap_tsx1x_register_flash(void); extern void qnap_tsx1x_power_off(void); #endif |