Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cdd5441 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion 



Some headers have used (now) wrong names or havn't had protection at
all.  This is needed before adding static inline functions to the
headers.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Daniel Mack <daniel@caiaq.de>
parent 46311661

arch/arm/plat-mxc/include/mach/mx1.h

+3 −3
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
 * published by the Free Software Foundation.

 */



#ifndef __ASM_ARCH_MXC_MX1_H__

#define __ASM_ARCH_MXC_MX1_H__

#ifndef __MACH_MX1_H__

#define __MACH_MX1_H__



#include <mach/vmalloc.h>
@@ -161,4 +161,4 @@ 
#define DMA_REQ_UART1_T		30

#define DMA_REQ_UART1_R		31



#endif /*  __ASM_ARCH_MXC_MX1_H__ */
 
#endif /* ifndef __MACH_MX1_H__ */

arch/arm/plat-mxc/include/mach/mx21.h

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
 * MA  02110-1301, USA.

 */



#ifndef __ASM_ARCH_MXC_MX21_H__

#define __ASM_ARCH_MXC_MX21_H__

#ifndef __MACH_MX21_H__

#define __MACH_MX21_H__



#define MX21_AIPI_BASE_ADDR		0x10000000

#define MX21_AIPI_BASE_ADDR_VIRT	0xf4000000
@@ -219,4 +219,4 @@ 
#define DMA_REQ_BMI_RX MX21_DMA_REQ_BMI_RX

#endif



#endif /* __ASM_ARCH_MXC_MX21_H__ */
 
#endif /* ifndef __MACH_MX21_H__ */

arch/arm/plat-mxc/include/mach/mx25.h

+1 −1
Original line number Diff line number Diff line
@@ -34,4 +34,4 @@ 


#define MX25_INT_FEC	57



#endif /* __MACH_MX25_H__ */
 
#endif /* ifndef __MACH_MX25_H__ */

arch/arm/plat-mxc/include/mach/mx27.h

+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
 * MA  02110-1301, USA.

 */



#ifndef __ASM_ARCH_MXC_MX27_H__

#define __ASM_ARCH_MXC_MX27_H__

#ifndef __MACH_MX27_H__

#define __MACH_MX27_H__



#define MX27_AIPI_BASE_ADDR		0x10000000

#define MX27_AIPI_BASE_ADDR_VIRT	0xf4000000
@@ -300,4 +300,4 @@ extern int mx27_revision(void); 
#define DMA_REQ_NFC MX27_DMA_REQ_NFC

#endif



#endif /* __ASM_ARCH_MXC_MX27_H__ */
 
#endif /* ifndef __MACH_MX27_H__ */

arch/arm/plat-mxc/include/mach/mx2x.h

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
 * MA  02110-1301, USA.

 */



#ifndef __ASM_ARCH_MXC_MX2x_H__

#define __ASM_ARCH_MXC_MX2x_H__

#ifndef __MACH_MX2x_H__

#define __MACH_MX2x_H__



/* The following addresses are common between i.MX21 and i.MX27 */
@@ -290,4 +290,4 @@ 
#define DMA_REQ_CSI_RX MX2x_DMA_REQ_CSI_RX

#endif



#endif /* __ASM_ARCH_MXC_MX2x_H__ */
 
#endif /* ifndef __MACH_MX2x_H__ */