aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-26 02:37:50 -0500
committerBen Dooks <ben-linux@fluff.org>2010-02-01 12:55:31 -0500
commit70556b143ae4cf404a73c2461a6bf7fef3fefbf7 (patch)
treefbbcd4328bc7614206e50cfb22c9272a23258ad0
parent916ee9249a7f19d8eb18cc9ee16ca495a517ab34 (diff)
ARM: S3C24XX: Remove old mach-s3c2442
Remove the old mach-s3c2442 directory now all is merged into mach-s3c2440 and remove it from the arch/arm build process. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/mach-s3c2442/Kconfig4
-rw-r--r--arch/arm/mach-s3c2442/Makefile15
4 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3bc5169f0f82..63f726f594f2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -794,7 +794,6 @@ source "arch/arm/mach-s3c2400/Kconfig"
794source "arch/arm/mach-s3c2410/Kconfig" 794source "arch/arm/mach-s3c2410/Kconfig"
795source "arch/arm/mach-s3c2412/Kconfig" 795source "arch/arm/mach-s3c2412/Kconfig"
796source "arch/arm/mach-s3c2440/Kconfig" 796source "arch/arm/mach-s3c2440/Kconfig"
797source "arch/arm/mach-s3c2442/Kconfig"
798source "arch/arm/mach-s3c2443/Kconfig" 797source "arch/arm/mach-s3c2443/Kconfig"
799endif 798endif
800 799
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index bbcd512ccf7e..893bcfc77708 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -158,7 +158,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008
158machine-$(CONFIG_ARCH_PXA) := pxa 158machine-$(CONFIG_ARCH_PXA) := pxa
159machine-$(CONFIG_ARCH_REALVIEW) := realview 159machine-$(CONFIG_ARCH_REALVIEW) := realview
160machine-$(CONFIG_ARCH_RPC) := rpc 160machine-$(CONFIG_ARCH_RPC) := rpc
161machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 161machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443
162machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 162machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
163machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 163machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410
164machine-$(CONFIG_ARCH_S5P6440) := s5p6440 164machine-$(CONFIG_ARCH_S5P6440) := s5p6440
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
deleted file mode 100644
index 29ef0669e959..000000000000
--- a/arch/arm/mach-s3c2442/Kconfig
+++ /dev/null
@@ -1,4 +0,0 @@
1# Copyright 2007 Simtec Electronics
2#
3# Licensed under GPLv2
4
diff --git a/arch/arm/mach-s3c2442/Makefile b/arch/arm/mach-s3c2442/Makefile
deleted file mode 100644
index 7e31ccdc83de..000000000000
--- a/arch/arm/mach-s3c2442/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
1# arch/arm/mach-s3c2442/Makefile
2#
3# Copyright 2007 Simtec Electronics
4#
5# Licensed under GPLv2
6
7obj-y :=
8obj-m :=
9obj-n :=
10obj- :=
11
12obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
13
14# Machine support
15