Commit e0ea0414 authored Dec 30, 2013 by Sachin Kamat Committed by Jiri Kosina Jan 02, 2014

arm: fix comment header and macro name

Commit da660b4a ("arm: Move sp810.h to include/linux/amba/")
moved the file to the current location but forgot to remove the pointer
to its previous location. Clean it up. While at it also change the header
file protection macros appropriately.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 0a4a6647

include/linux/amba/sp810.h

+3 −5

Original line number	Diff line number	Diff line
		/*
		* arch/arm/include/asm/hardware/sp810.h
		*
		* ARM PrimeXsys System Controller SP810 header file
		*
		* Copyright (C) 2009 ST Microelectronics
		@@ -11,8 +9,8 @@
		* warranty of any kind, whether express or implied.
		*/

		#ifndef __ASM_ARM_SP810_H
		#define __ASM_ARM_SP810_H
		#ifndef __AMBA_SP810_H
		#define __AMBA_SP810_H

		#include <linux/io.h>

		@@ -61,4 +59,4 @@ static inline void sysctl_soft_reset(void __iomem *base)
		writel(0, base + SCSYSSTAT);
		}

		#endif /* __ASM_ARM_SP810_H */
		#endif /* __AMBA_SP810_H */