diff options
| author | Russell King | 2010-05-17 09:49:25 +0200 |
|---|---|---|
| committer | Russell King | 2010-05-17 09:49:25 +0200 |
| commit | a3685f00652af83f12b63e3b4ef48f29581ba48b (patch) | |
| tree | 18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec /arch/arm/Makefile | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/o... (diff) | |
| parent | ARM: SAMSUNG: Update S3C2416 entry with S3C2450 (diff) | |
| download | kernel-qcow2-linux-a3685f00652af83f12b63e3b4ef48f29581ba48b.tar.gz kernel-qcow2-linux-a3685f00652af83f12b63e3b4ef48f29581ba48b.tar.xz kernel-qcow2-linux-a3685f00652af83f12b63e3b4ef48f29581ba48b.zip | |
Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 3e312ec8e624..7cdaf5afcee6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -161,7 +161,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 machine-$(CONFIG_ARCH_PXA) := pxa machine-$(CONFIG_ARCH_REALVIEW) := realview machine-$(CONFIG_ARCH_RPC) := rpc -machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443 +machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443 machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx machine-$(CONFIG_ARCH_S5P6440) := s5p6440 |