diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 18:38:26 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 18:38:26 -0500 |
| commit | 7f0ff702cdf51472750f4b6042866f1b83a11215 (patch) | |
| tree | 15ce32849cfb8ff3c7205e97a5f76051c08058b0 /arch/arm/Makefile | |
| parent | d35b7a829a13b69c4747b69380b504b6544a2375 (diff) | |
| parent | 110d85acd479b80dc11b7fa3abef63285da8ea0c (diff) | |
ARM: Merge next-samsung-s3c64xx-platdeletion
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung
Conflicts:
arch/arm/mach-s3c64xx/Makefile (fixed)
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 893bcfc77708..a2a941d98c25 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -160,7 +160,7 @@ machine-$(CONFIG_ARCH_REALVIEW) := realview | |||
| 160 | machine-$(CONFIG_ARCH_RPC) := rpc | 160 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 161 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443 | 161 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443 |
| 162 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 | 162 | machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 |
| 163 | machine-$(CONFIG_ARCH_S3C64XX) := s3c6400 s3c6410 | 163 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
| 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 | 164 | machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |
| 165 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 | 165 | machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 |
| 166 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 166 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| @@ -183,7 +183,7 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik | |||
| 183 | plat-$(CONFIG_PLAT_ORION) := orion | 183 | plat-$(CONFIG_PLAT_ORION) := orion |
| 184 | plat-$(CONFIG_PLAT_PXA) := pxa | 184 | plat-$(CONFIG_PLAT_PXA) := pxa |
| 185 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung | 185 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung |
| 186 | plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung | 186 | plat-$(CONFIG_ARCH_S3C64XX) := s3c samsung |
| 187 | plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung | 187 | plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung |
| 188 | plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c | 188 | plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c |
| 189 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx | 189 | plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx |