diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:40:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:40:15 -0500 |
| commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch) | |
| tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 /arch/arm/Makefile | |
| parent | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (diff) | |
| parent | d608c738bb8fb37e5fbfcdef9c566764f2fea086 (diff) | |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 10e933b2f40c..2dca13f60168 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -160,11 +160,13 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 | |||
| 160 | machine-$(CONFIG_ARCH_PXA) := pxa | 160 | machine-$(CONFIG_ARCH_PXA) := pxa |
| 161 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 161 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
| 162 | machine-$(CONFIG_ARCH_RPC) := rpc | 162 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 163 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 163 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443 |
| 164 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 164 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |
| 165 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 | 165 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
| 166 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | 166 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |
| 167 | machine-$(CONFIG_ARCH_S5P6442) := s5p6442 | ||
| 167 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 | 168 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 |
| 169 | machine-$(CONFIG_ARCH_S5PV210) := s5pv210 | ||
| 168 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 170 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 169 | machine-$(CONFIG_ARCH_SHARK) := shark | 171 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 170 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile | 172 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile |
| @@ -180,15 +182,15 @@ machine-$(CONFIG_FOOTBRIDGE) := footbridge | |||
| 180 | # by CONFIG_* macro name. | 182 | # by CONFIG_* macro name. |
| 181 | plat-$(CONFIG_ARCH_MXC) := mxc | 183 | plat-$(CONFIG_ARCH_MXC) := mxc |
| 182 | plat-$(CONFIG_ARCH_OMAP) := omap | 184 | plat-$(CONFIG_ARCH_OMAP) := omap |
| 185 | plat-$(CONFIG_ARCH_S3C64XX) := samsung | ||
| 183 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx | 186 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx |
| 184 | plat-$(CONFIG_PLAT_IOP) := iop | 187 | plat-$(CONFIG_PLAT_IOP) := iop |
| 185 | plat-$(CONFIG_PLAT_NOMADIK) := nomadik | 188 | plat-$(CONFIG_PLAT_NOMADIK) := nomadik |
| 186 | plat-$(CONFIG_PLAT_ORION) := orion | 189 | plat-$(CONFIG_PLAT_ORION) := orion |
| 187 | plat-$(CONFIG_PLAT_PXA) := pxa | 190 | plat-$(CONFIG_PLAT_PXA) := pxa |
| 188 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung | 191 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung |
| 189 | plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung | 192 | plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx samsung |
| 190 | plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung | 193 | plat-$(CONFIG_PLAT_S5P) := s5p samsung |
| 191 | plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c | ||
| 192 | 194 | ||
| 193 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 195 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
| 194 | # This is what happens if you forget the IOCS16 line. | 196 | # This is what happens if you forget the IOCS16 line. |