diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 09:12:51 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 09:12:51 +0000 |
| commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
| tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /arch/arm/configs/corgi_defconfig | |
| parent | 67fbc2312312095acc2f19a0b601bac10f84cf9d (diff) | |
| parent | 58c2467355ed3154a12ee49d8f8236547145c9d3 (diff) | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/configs/corgi_defconfig')
| -rw-r--r-- | arch/arm/configs/corgi_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index f3af0b593eb..98765438048 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y # CONFIG_MACH_AKITA is not set # CONFIG_MACH_SPITZ is not set # CONFIG_MACH_BORZOI is not set -CONFIG_MACH_TOSA=y +# CONFIG_MACH_TOSA is not set # CONFIG_ARCH_VIPER is not set # CONFIG_ARCH_PXA_ESERIES is not set # CONFIG_TRIZEPS_PXA is not set |