Skip to content

Commit

Permalink
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
Browse files Browse the repository at this point in the history
* '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}
  • Loading branch information
Linus Torvalds committed Nov 2, 2011
2 parents cd9a0b6 + 4702abd commit 510597e
Show file tree
Hide file tree
Showing 29 changed files with 0 additions and 1,307 deletions.
10 changes: 0 additions & 10 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 0 additions & 19 deletions arch/arm/mach-nuc93x/Kconfig

This file was deleted.

14 changes: 0 additions & 14 deletions arch/arm/mach-nuc93x/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions arch/arm/mach-nuc93x/Makefile.boot

This file was deleted.

83 changes: 0 additions & 83 deletions arch/arm/mach-nuc93x/clock.c

This file was deleted.

36 changes: 0 additions & 36 deletions arch/arm/mach-nuc93x/clock.h

This file was deleted.

135 changes: 0 additions & 135 deletions arch/arm/mach-nuc93x/cpu.c

This file was deleted.

48 changes: 0 additions & 48 deletions arch/arm/mach-nuc93x/cpu.h

This file was deleted.

Loading

0 comments on commit 510597e

Please sign in to comment.