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

Commit aa309000 authored by Russell King's avatar Russell King
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-tcc into devel-stable
parents 151b6a5f 448352ae

MAINTAINERS

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

F:	drivers/sh/



ARM/TELECHIPS ARM ARCHITECTURE

M:	"Hans J. Koch" <hjk@linutronix.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

+11 −0
Original line number Diff line number Diff line
@@ -748,6 +748,15 @@ 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 CPU_ARM926T

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_CLOCKEVENTS

	help

	  Support for Telechips TCC ARM926-based systems.



config ARCH_LH7A40X

	bool "Sharp LH7A40X"

	select CPU_ARM922T
@@ -916,6 +925,8 @@ 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-s3c2400/Kconfig"

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

arch/arm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ machine-$(CONFIG_ARCH_SHARK) := shark 
machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_TCC8K)		:= tcc8k

machine-$(CONFIG_ARCH_TEGRA)		:= tegra

machine-$(CONFIG_ARCH_U300)		:= u300

machine-$(CONFIG_ARCH_U8500)		:= ux500
@@ -202,6 +203,7 @@ plat-$(CONFIG_ARCH_MXC) := mxc 
plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx

plat-$(CONFIG_ARCH_TCC_926)	:= tcc

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_ORION)	:= orion

arch/arm/mach-tcc8k/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
if ARCH_TCC8K



comment "TCC8000 systems:"



config MACH_TCC8000_SDK

	bool "Telechips TCC8000-SDK development kit"

	default y

	help

	  Support for the Telechips TCC8000-SDK board.



endif

arch/arm/mach-tcc8k/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# Makefile for TCC8K boards and common files.

#



# Common support

obj-y += clock.o irq.o time.o io.o devices.o



# Board specific support

obj-$(CONFIG_MACH_TCC8000_SDK) += board-tcc8000-sdk.o