Merge commit 'v2.6.29-rc1' into core/urgent

[karo-tx-linux.git] / arch / arm / configs / integrator_defconfig

diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index 692ab57ba1ca9b484e39d1e8c944d6e90f70c45e..3ce96e60b4094417eb4e807b601d61cd6ad8c9c9 100644 (file)
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -835,7 +835,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_LL is not set