2020-09-18 01:45:38

by liwei (GF)

Subject: [PATCH] MIPS: Correct the header guard of r4k-timer.h

Rename the header guard of r4k-timer.h from __ASM_R4K_TYPES_H to
__ASM_R4K_TIMER_H what corresponding with the file name.

Signed-off-by: Wei Li <[email protected]>
---
arch/mips/include/asm/r4k-timer.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/include/asm/r4k-timer.h b/arch/mips/include/asm/r4k-timer.h
index afe9e0e03fe9..6e7361629348 100644
--- a/arch/mips/include/asm/r4k-timer.h
+++ b/arch/mips/include/asm/r4k-timer.h
@@ -5,8 +5,8 @@
*
* Copyright (C) 2008 by Ralf Baechle ([email protected])
*/
-#ifndef __ASM_R4K_TYPES_H
-#define __ASM_R4K_TYPES_H
+#ifndef __ASM_R4K_TIMER_H
+#define __ASM_R4K_TIMER_H

#include <linux/compiler.h>

@@ -27,4 +27,4 @@ static inline void synchronise_count_slave(int cpu)

#endif

-#endif /* __ASM_R4K_TYPES_H */
+#endif /* __ASM_R4K_TIMER_H */
--
2.17.1

2020-09-18 13:59:12

by Thomas Bogendoerfer

Subject: Re: [PATCH] MIPS: Correct the header guard of r4k-timer.h

On Fri, Sep 18, 2020 at 09:41:11AM +0800, Wei Li wrote:
> Rename the header guard of r4k-timer.h from __ASM_R4K_TYPES_H to
> __ASM_R4K_TIMER_H what corresponding with the file name.
>
> Signed-off-by: Wei Li <[email protected]>
> ---
> arch/mips/include/asm/r4k-timer.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]