From 0c4847e5958a6fb6d84e82c6738effaf5b442d07 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 7 Jun 2008 20:41:19 +0000 Subject: [PATCH] * debian/config/config - Unset R3964. - Set HANGCHECK_TIMER=m. * debian/config/s390/config: Unset PAGE_STATES. svn path=/dists/trunk/linux-2.6/; revision=11568 --- debian/config/config | 2 ++ debian/config/s390/config | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/config/config b/debian/config/config index 961de7f85..16d8bafa0 100644 --- a/debian/config/config +++ b/debian/config/config @@ -193,9 +193,11 @@ CONFIG_RISCOM8=m CONFIG_NOZOMI=m CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set +# CONFIG_R3964 is not set CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m # CONFIG_RAW_DRIVER is not set +CONFIG_HANGCHECK_TIMER=m CONFIG_TELCLOCK=m ## diff --git a/debian/config/s390/config b/debian/config/s390/config index 80598aedf..c224ed11c 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -27,6 +27,8 @@ CONFIG_PFAULT=y CONFIG_CMM=y CONFIG_CMM_PROC=y CONFIG_CMM_IUCV=y +#. unsure +# CONFIG_PAGE_STATES is not set CONFIG_VIRT_TIMER=y CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_APPLDATA_BASE=y