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

Commit 510597e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: mach-nuc93x: delete

Fix up trivial delete/edit conflicts in
	arch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}
parents cd9a0b6b 4702abd3

arch/arm/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -609,14 +609,6 @@ config ARCH_W90X900 
	  <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/

		ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>



config ARCH_NUC93X

	bool "Nuvoton NUC93X CPU"

	select CPU_ARM926T

	select CLKDEV_LOOKUP

	help

	  Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a

	  low-power and high performance MPEG-4/JPEG multimedia controller chip.



config ARCH_TEGRA

	bool "NVIDIA Tegra"

	select CLKDEV_LOOKUP
@@ -1012,8 +1004,6 @@ source "arch/arm/mach-netx/Kconfig" 
source "arch/arm/mach-nomadik/Kconfig"

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



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



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



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

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ machine-$(CONFIG_ARCH_VERSATILE) := versatile 
machine-$(CONFIG_ARCH_VEXPRESS)		:= vexpress

machine-$(CONFIG_ARCH_VT8500)		:= vt8500

machine-$(CONFIG_ARCH_W90X900)		:= w90x900

machine-$(CONFIG_ARCH_NUC93X)		:= nuc93x

machine-$(CONFIG_FOOTBRIDGE)		:= footbridge

machine-$(CONFIG_MACH_SPEAR300)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR310)		:= spear3xx

arch/arm/mach-nuc93x/Kconfig

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
if ARCH_NUC93X



config CPU_NUC932

	bool

	help

	  Support for NUC932 of Nuvoton NUC93X CPUs.



menu "NUC932 Machines"



config MACH_NUC932EVB

	bool "Nuvoton NUC932 Evaluation Board"

	default y

	select CPU_NUC932

	help

	   Say Y here if you are using the Nuvoton NUC932EVB



endmenu



endif

arch/arm/mach-nuc93x/Makefile

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



# Object file lists.



obj-y				:= irq.o time.o dev.o cpu.o clock.o

# NUC932 CPU support files



obj-$(CONFIG_CPU_NUC932)	+= nuc932.o



# machine support



obj-$(CONFIG_MACH_NUC932EVB)	+= mach-nuc932evb.o

arch/arm/mach-nuc93x/Makefile.boot

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
zreladdr-y	+= 0x00008000

params_phys-y	:= 0x00000100