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

Commit cfb41bf7 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] fix OMAP include loops 



OMAP has two include loops in its header files:

  asm-arm/hardware.h <- asm-arm/arch-omap/io.h <-
   asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h

  asm-arm/arch-omap/board-palmte.h <-
   asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h <-
   asm-arm/arch-omap/gpio.h <- asm-arm/arch-omap/board-palmte.h

Circular include dependencies are dangerous since they can result in
inconsistent definitions being provided to other code, especially if
'#ifndef' constructs are used.

Solve these by removing the offending includes, and add additional
includes where necessary.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2a740d7a

include/asm-arm/arch-omap/board-palmte.h

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#ifndef __OMAP_BOARD_PALMTE_H

#define __OMAP_BOARD_PALMTE_H



#include <asm/arch/gpio.h>



#define PALMTE_USBDETECT_GPIO	0

#define PALMTE_USB_OR_DC_GPIO	1

#define PALMTE_TSC_GPIO		4

include/asm-arm/arch-omap/entry-macro.S

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * warranty of any kind, whether express or implied.

 */

#include <asm/hardware.h>

#include <asm/arch/io.h>

#include <asm/arch/irqs.h>



#if defined(CONFIG_ARCH_OMAP1)

include/asm-arm/arch-omap/gpio.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#ifndef __ASM_ARCH_OMAP_GPIO_H

#define __ASM_ARCH_OMAP_GPIO_H



#include <asm/hardware.h>

#include <asm/arch/irqs.h>

#include <asm/io.h>

include/asm-arm/arch-omap/hardware.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <asm/types.h>

#include <asm/arch/cpu.h>

#endif

#include <asm/arch/io.h>

#include <asm/arch/serial.h>



/*