diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:33:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:33:54 +0000 |
| commit | 602fd7c36728a04e61a442c9755e7d454501266c (patch) | |
| tree | 6be77464bd07934a40959d68e5d08d75829bdc49 /arch/arm/Makefile | |
| parent | d7931d9f7ab9de9158c6905caae979999134ad4d (diff) | |
| parent | 88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff) | |
| download | blackbird-op-linux-602fd7c36728a04e61a442c9755e7d454501266c.tar.gz blackbird-op-linux-602fd7c36728a04e61a442c9755e7d454501266c.zip | |
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2ddc323b1c6a..8c0d08fbd991 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -179,9 +179,9 @@ plat-$(CONFIG_ARCH_OMAP) := omap plat-$(CONFIG_PLAT_IOP) := iop plat-$(CONFIG_PLAT_ORION) := orion plat-$(CONFIG_PLAT_PXA) := pxa -plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c -plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c -plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c +plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung +plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung +plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx ifeq ($(CONFIG_ARCH_EBSA110),y) |
