summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/at91rm9200dk_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 15:50:35 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 15:50:35 -0800
commit1a56f54c351d8d2e276aefc4f4094037c178d6c7 (patch)
tree88abb7801141db3d03079bd0ef2a903cbf3a1aba /arch/arm/configs/at91rm9200dk_defconfig
parentd1ffa5669cd834f901141756e63195f48c1bfbf9 (diff)
parent2c4c6b27028b38204de8ade505f925d53d234422 (diff)
downloadop-kernel-dev-1a56f54c351d8d2e276aefc4f4094037c178d6c7.zip
op-kernel-dev-1a56f54c351d8d2e276aefc4f4094037c178d6c7.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/configs/at91rm9200dk_defconfig')
-rw-r--r--arch/arm/configs/at91rm9200dk_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig
index 5cdd13a..1fe73d1 100644
--- a/arch/arm/configs/at91rm9200dk_defconfig
+++ b/arch/arm/configs/at91rm9200dk_defconfig
@@ -85,7 +85,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
OpenPOWER on IntegriCloud