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

Commit 7b9dd471 authored by Russell King's avatar Russell King
Browse files

Merge branch 'restart' into for-linus 

Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
parents 2e0e9434 0575fb75

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -1124,13 +1124,6 @@ S: Supported 
F:	arch/arm/mach-shmobile/

F:	drivers/sh/



ARM/TELECHIPS ARM ARCHITECTURE

M:	"Hans J. Koch" <hjk@hansjkoch.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/plat-tcc/

F:	arch/arm/mach-tcc8k/



ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -877,16 +877,6 @@ config ARCH_SHARK 
	  Support for the StrongARM based Digital DNARD machine, also known

	  as "Shark" (<http://www.shark-linux.de/shark.html>).



config ARCH_TCC_926

	bool "Telechips TCC ARM926-based systems"

	select CLKSRC_MMIO

	select CPU_ARM926T

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	help

	  Support for Telechips TCC ARM926-based systems.



config ARCH_U300

	bool "ST-Ericsson U300 Series"

	depends on MMU
@@ -1073,8 +1063,6 @@ source "arch/arm/plat-s5p/Kconfig" 


source "arch/arm/plat-spear/Kconfig"



source "arch/arm/plat-tcc/Kconfig"



if ARCH_S3C2410

source "arch/arm/mach-s3c2410/Kconfig"

source "arch/arm/mach-s3c2412/Kconfig"

arch/arm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ machine-$(CONFIG_ARCH_EXYNOS4) := exynos 
machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

machine-$(CONFIG_ARCH_TCC8K)		:= tcc8k

machine-$(CONFIG_ARCH_TEGRA)		:= tegra

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_U8500)		:= ux500
@@ -204,7 +203,6 @@ machine-$(CONFIG_ARCH_ZYNQ) := zynq 
plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_TCC_926)	:= tcc

plat-$(CONFIG_ARCH_ZYNQ)	:= versatile

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

arch/arm/include/asm/hardware/iop3xx.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ extern int iop3xx_get_init_atu(void); 
void iop3xx_map_io(void);

void iop_init_cp6_handler(void);

void iop_init_time(unsigned long tickrate);

void iop3xx_restart(char, const char *);



static inline u32 read_tmr0(void)

{

arch/arm/include/asm/system.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ extern void __show_regs(struct pt_regs *); 
extern int __pure cpu_architecture(void);

extern void cpu_init(void);



void arm_machine_restart(char mode, const char *cmd);

void soft_restart(unsigned long);

extern void (*arm_pm_restart)(char str, const char *cmd);