diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:29:06 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:29:06 -0500 |
| commit | ea9b395fe20ac74be788f415af2622ac8f0c35c7 (patch) | |
| tree | d1653e1a4cbe360aa7132ea4e29ab92a02038224 /arch/arm/configs/ixdp2800_defconfig | |
| parent | 61420e147a706ee7c7a902008045547fb2a2a330 (diff) | |
| parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/arm/configs/ixdp2800_defconfig')
| -rw-r--r-- | arch/arm/configs/ixdp2800_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/ixdp2800_defconfig b/arch/arm/configs/ixdp2800_defconfig index 0fddbde8583..4248123815e 100644 --- a/arch/arm/configs/ixdp2800_defconfig +++ b/arch/arm/configs/ixdp2800_defconfig @@ -86,7 +86,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_CAMELOT is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_IOP3XX is not set |