diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
| commit | e6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch) | |
| tree | 425ea9463cbec0b1975b8a33d9a56817143055d0 /arch/mips/include/asm/processor.h | |
| parent | ee9c799c231324de681eb21e06d8bf4842768b75 (diff) | |
| parent | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/mips/include/asm/processor.h')
| -rw-r--r-- | arch/mips/include/asm/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index 71686c897dea..1470b7b68b0e 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | /* | 28 | /* |
| 29 | * System setup and hardware flags.. | 29 | * System setup and hardware flags.. |
| 30 | */ | 30 | */ |
| 31 | extern void (*cpu_wait)(void); | ||
| 32 | 31 | ||
| 33 | extern unsigned int vced_count, vcei_count; | 32 | extern unsigned int vced_count, vcei_count; |
| 34 | 33 | ||