[kernel] r7576 - in dists/trunk/linux-2.6/debian: . arch

[maximilian attems]

Author: maks-guest
Date: Thu Oct  5 14:01:10 2006
New Revision: 7576

Modified:
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/changelog

Log:
don't enable CONFIG_IDE_TASK_IOCTL close to a release


Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Thu Oct  5 14:01:10 2006
@@ -1036,7 +1036,7 @@
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_IDE_TASK_IOCTL=y
+# CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_CLS_U32_PERF=y

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Oct  5 14:01:10 2006
@@ -8,7 +8,6 @@
     there's a kernel upgrade :/
 
   [ Frederik Schüler ]
-  * Activate CONFIG_IDE_TASK_IOCTL globally. (Closes: #390616)
   * Activate CONFIG_NET_CLS_* globaly. (Closes: #389918)
   * Make CONFIG_EFI_VARS modular on i386. (Closes: #381951)
   * Activate CONFIG_SCSI_ARCMSR on amd64, powerpc, sparc too.