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

Commit 3c0bdac3 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Remove mach-types.h from head.S 



We don't really need to check whether the machine type is Netwinder
or CATS before setting up the PCI IO mapping for debugging.  This
allows us to eliminate asm/mach-types.h from head.S

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 225937bd

arch/arm/kernel/head.S

+3 −8
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


#include <asm/assembler.h>

#include <asm/domain.h>

#include <asm/mach-types.h>

#include <asm/procinfo.h>

#include <asm/ptrace.h>

#include <asm/asm-offsets.h>
@@ -343,16 +342,12 @@ __create_page_tables: 
	bne	1b

#if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS)

	/*

	 * If we're using the NetWinder, we need to map in

	 * the 16550-type serial port for the debug messages

	 * If we're using the NetWinder or CATS, we also need to map

	 * in the 16550-type serial port for the debug messages

	 */

	teq	r1, #MACH_TYPE_NETWINDER

	teqne	r1, #MACH_TYPE_CATS

	bne	1f

	add	r0, r4, #0xff000000 >> 18

	orr	r3, r7, #0x7c000000

	str	r3, [r0]

1:

#endif

#ifdef CONFIG_ARCH_RPC

	/*