diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 07:04:34 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 07:04:34 +0200 |
| commit | fc600432cd23e35c85de2ff4468d816d6938a112 (patch) | |
| tree | c191c51e4458ec31c1d8254f01e23b2e1574b6f4 /arch/mips/include/asm/r4k-timer.h | |
| parent | ASoC: omap-mcbsp: Single macro for st channel volume set/get (diff) | |
| parent | Linux 3.6-rc4 (diff) | |
| download | linux-fc600432cd23e35c85de2ff4468d816d6938a112.tar.xz linux-fc600432cd23e35c85de2ff4468d816d6938a112.zip | |
Merge tag 'v3.6-rc4' into asoc-omap
Linux 3.6-rc4
Diffstat (limited to 'arch/mips/include/asm/r4k-timer.h')
| -rw-r--r-- | arch/mips/include/asm/r4k-timer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/r4k-timer.h b/arch/mips/include/asm/r4k-timer.h index a37d12b3b61c..afe9e0e03fe9 100644 --- a/arch/mips/include/asm/r4k-timer.h +++ b/arch/mips/include/asm/r4k-timer.h @@ -12,16 +12,16 @@ #ifdef CONFIG_SYNC_R4K -extern void synchronise_count_master(void); -extern void synchronise_count_slave(void); +extern void synchronise_count_master(int cpu); +extern void synchronise_count_slave(int cpu); #else -static inline void synchronise_count_master(void) +static inline void synchronise_count_master(int cpu) { } -static inline void synchronise_count_slave(void) +static inline void synchronise_count_slave(int cpu) { } |