diff --git a/[refs] b/[refs] index 629232208a0c..c319546e5a9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2555e663b367b8d555e76023f4de3f6338c28d6c +refs/heads/master: b7df2a7beb9cbdd1acfd52200e2de76ec18c90a1 diff --git a/trunk/arch/arm/configs/s5p6440_defconfig b/trunk/arch/arm/configs/s5p64x0_defconfig similarity index 97% rename from trunk/arch/arm/configs/s5p6440_defconfig rename to trunk/arch/arm/configs/s5p64x0_defconfig index 0b0266c6d326..2993ecd35145 100644 --- a/trunk/arch/arm/configs/s5p6440_defconfig +++ b/trunk/arch/arm/configs/s5p64x0_defconfig @@ -5,10 +5,11 @@ CONFIG_KALLSYMS_ALL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S5P6440=y +CONFIG_ARCH_S5P64X0=y CONFIG_S3C_BOOT_ERROR_RESET=y CONFIG_S3C_LOWLEVEL_UART_PORT=1 CONFIG_MACH_SMDK6440=y +CONFIG_MACH_SMDK6450=y CONFIG_CPU_32v6K=y CONFIG_AEABI=y CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"