diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-07 09:43:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-07 09:43:45 +0200 |
| commit | 556ef63255f1a6f82910a637c4164dbf7d3d1af2 (patch) | |
| tree | ae209fe4959e0837bf4eb72abc6e02c8a82179a1 /arch/mips/cavium-octeon/cpu.c | |
| parent | Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/pa... (diff) | |
| parent | Linux 2.6.36-rc7 (diff) | |
| download | linux-556ef63255f1a6f82910a637c4164dbf7d3d1af2.tar.xz linux-556ef63255f1a6f82910a637c4164dbf7d3d1af2.zip | |
Merge commit 'v2.6.36-rc7' into core/rcu
Merge reason: Update from -rc3 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/cavium-octeon/cpu.c')
| -rw-r--r-- | arch/mips/cavium-octeon/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/cpu.c b/arch/mips/cavium-octeon/cpu.c index c664c8cc2b42..a5b427909b5c 100644 --- a/arch/mips/cavium-octeon/cpu.c +++ b/arch/mips/cavium-octeon/cpu.c @@ -41,7 +41,7 @@ static int cnmips_cu2_call(struct notifier_block *nfb, unsigned long action, return NOTIFY_OK; /* Let default notifier send signals */ } -static int cnmips_cu2_setup(void) +static int __init cnmips_cu2_setup(void) { return cu2_notifier(cnmips_cu2_call, 0); } |