diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-25 13:49:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-25 13:49:07 +0100 |
| commit | 8fd3ec6309dc3c8b6addc9015458bfae87592a1f (patch) | |
| tree | dd7169c446f983b6fda884ff9b6bc3e1bbe5904e /arch/arm/configs/s3c2410_defconfig | |
| parent | f9bfccf11df33dae874aac58b0926004ae833167 (diff) | |
| parent | 76609a6928bff29ca05a94420ae3e088fbb9c2f9 (diff) | |
Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/configs/s3c2410_defconfig')
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 2d58b8fe59be..b49810461e41 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@ -260,6 +260,7 @@ CONFIG_MACH_NEXCODER_2440=y CONFIG_SMDK2440_CPU2440=y CONFIG_MACH_AT2440EVB=y CONFIG_CPU_S3C2442=y +CONFIG_MACH_MINI2440=y # # S3C2442 Machines @@ -2298,7 +2299,6 @@ CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_LL=y # CONFIG_DEBUG_ICEDCC is not set -CONFIG_DEBUG_S3C_PORT=y CONFIG_DEBUG_S3C_UART=0 # |