Merge branch 'next/defconfig-samsung' of git://git.kernel.org/pub/scm…

…/linux/kernel/git/kgene/linux-samsung into next/defconfig

From Kukjin Kim:

This is for updating s3c6400_defconfig to build every s3c64xx stuff.

This helps to know at least building error before merging them.

* 'next/defconfig-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: s3c6400_defconfig: enable more boards in defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/configs/s3c6400_defconfig

@@ -9,11 +9,14 @@ CONFIG_ARCH_S3C64XX=y
 CONFIG_S3C_BOOT_ERROR_RESET=y
 CONFIG_MACH_SMDK6400=y
 CONFIG_MACH_ANW6410=y
+CONFIG_MACH_MINI6410=y
+CONFIG_MACH_REAL6410=y
 CONFIG_MACH_SMDK6410=y
 CONFIG_MACH_NCP=y
 CONFIG_MACH_HMT=y
 CONFIG_MACH_SMARTQ5=y
 CONFIG_MACH_SMARTQ7=y
+CONFIG_MACH_WLF_CRAGG_6410=y
 CONFIG_CPU_32v6K=y
 CONFIG_AEABI=y
 CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144"