diff options
| author | Russell King | 2010-08-09 15:07:19 +0200 |
|---|---|---|
| committer | Russell King | 2010-08-09 15:07:19 +0200 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/Makefile | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev... (diff) | |
| parent | ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3 (diff) | |
| download | kernel-qcow2-linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.gz kernel-qcow2-linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.xz kernel-qcow2-linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 63d998e8c672..24f58d8576ed 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -174,6 +174,7 @@ machine-$(CONFIG_ARCH_S5P6440) := s5p6440 machine-$(CONFIG_ARCH_S5P6442) := s5p6442 machine-$(CONFIG_ARCH_S5PC100) := s5pc100 machine-$(CONFIG_ARCH_S5PV210) := s5pv210 +machine-$(CONFIG_ARCH_S5PV310) := s5pv310 machine-$(CONFIG_ARCH_SA1100) := sa1100 machine-$(CONFIG_ARCH_SHARK) := shark machine-$(CONFIG_ARCH_SHMOBILE) := shmobile |