diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
| commit | 87eb367003887cdc81a5d183efea227b5b488961 (patch) | |
| tree | 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe /arch/mips/kernel/smtc.c | |
| parent | ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 (diff) | |
| parent | 05d17608a69b3ae653ea5c9857283bef3439c733 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c
Diffstat (limited to 'arch/mips/kernel/smtc.c')
| -rw-r--r-- | arch/mips/kernel/smtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 25e825aea327..a95dea5459c4 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
| @@ -182,7 +182,7 @@ static int vpemask[2][8] = { | |||
| 182 | {0, 0, 0, 0, 0, 0, 0, 1} | 182 | {0, 0, 0, 0, 0, 0, 0, 1} |
| 183 | }; | 183 | }; |
| 184 | int tcnoprog[NR_CPUS]; | 184 | int tcnoprog[NR_CPUS]; |
| 185 | static atomic_t idle_hook_initialized = {0}; | 185 | static atomic_t idle_hook_initialized = ATOMIC_INIT(0); |
| 186 | static int clock_hang_reported[NR_CPUS]; | 186 | static int clock_hang_reported[NR_CPUS]; |
| 187 | 187 | ||
| 188 | #endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */ | 188 | #endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */ |