diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 08:20:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 08:20:38 -0700 |
| commit | 6aa033d7efb85830535bb83cf6713d6025ae6e59 (patch) | |
| tree | 27a4566bc87fc6d34a78f582531cdbe0bd7018ca /arch/arm/mach-kirkwood/tsx1x-common.h | |
| parent | 58b164b50a6dba53c7b154f632c1f9d67832d3e4 (diff) | |
| parent | f9578fc07832ee8db8b0fbde489e00ad35452ac9 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text
ARM: 6263/1: ns9xxx: fix FTBFS for zImage
ARM: 6262/1: arm/clps711x: fix debug macro compilation failure
ARM: 6261/1: arm/shark: fix debug macro compilation failure
ARM: 6260/1: arm/plat-spear: fix debug macro compilation failure
ARM: 6259/1: arm/ns9xxx: fix debug macro compilation failure
ARM: 6258/1: arm/h720x: fix debug macro compilation failure
ARM: 6233/1: Delete a wrong redundant right parenthesis
ARM: 6230/1: fix nuc900 touchscreen clk definition bug
[ARM] pxa: fix incorrect CONFIG_CPU_PXA27x to CONFIG_PXA27x
[ARM] pxa/colibri-pxa300: fix AC97 init
[ARM] pxa: fix incorrect order of AC97 reset pin configs
[ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_base
[ARM] pxa: cpufreq-pxa2xx: fix DRI recomputation routine
[ARM] pxa/corgi: fix MMC/SD card detection failure
Diffstat (limited to 'arch/arm/mach-kirkwood/tsx1x-common.h')
| -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 9a592962a6e..7fa037361b5 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 |