From d1736cc32c1edc5d69651da57353577f7a576f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Tue, 11 Oct 2005 16:10:51 +0000 Subject: [PATCH] deactivate BLK_DEV_IDESCSI on all architectures. svn path=/dists/trunk/linux-2.6/; revision=4424 --- debian/arch/alpha/config | 1 - debian/arch/amd64/config | 7 +++---- debian/arch/arm/config.rpc | 1 - debian/arch/config | 1 + debian/arch/hppa/config | 1 - debian/arch/i386/config | 1 - debian/arch/ia64/config | 1 - debian/arch/m68k/config.amiga | 1 - debian/arch/m68k/config.atari | 1 - debian/arch/m68k/config.mac | 1 - debian/arch/m68k/config.q40 | 1 - debian/arch/powerpc/config | 1 - debian/arch/powerpc/config.apus | 1 - debian/arch/sparc/config.sparc64 | 1 - debian/arch/sparc/config.sparc64-smp | 1 - debian/changelog | 1 + 16 files changed, 5 insertions(+), 17 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index f41736bac..7d4513744 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -210,7 +210,6 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECD=m CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -CONFIG_BLK_DEV_IDESCSI=m CONFIG_IDE_TASK_IOCTL=y CONFIG_IDE_GENERIC=m # CONFIG_BLK_DEV_IDEPNP is not set diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index da0607bf1..9970b3d91 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -256,7 +256,6 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECD=m CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_CMD640=y @@ -1192,9 +1191,6 @@ CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m CONFIG_FB=y -CONFIG_FB_CFB_FILLRECT=m -CONFIG_FB_CFB_COPYAREA=m -CONFIG_FB_SOFT_CURSOR=m # CONFIG_FB_MACMODES is not set CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y @@ -1661,3 +1657,6 @@ CONFIG_FUSION=y CONFIG_FB_VESA=y CONFIG_HPET_EMULATE_RTC=y CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SOFT_CURSOR=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 0e533289d..6ef61ce7e 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -48,7 +48,6 @@ CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set CONFIG_IDE_ARM=y CONFIG_BLK_DEV_IDE_ICSIDE=y CONFIG_BLK_DEV_IDEDMA_ICS=y diff --git a/debian/arch/config b/debian/arch/config index 271f0be52..a2b55d6d6 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -579,3 +579,4 @@ CONFIG_IP_SCTP=m CONFIG_SCTP_HMAC_SHA1=y # CONFIG_SCTP_HMAC_MD5 is not set +# CONFIG_BLK_DEV_IDESCSI is not set diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 37fe96ccb..bee7949fd 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -126,7 +126,6 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECD=m # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set -CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_IDEPCI=y diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 166de5cdc..b9d5789b4 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -317,7 +317,6 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECD=m CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_CMD640=y diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 3e414cfbe..e4017993a 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -213,7 +213,6 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECD=m CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -CONFIG_BLK_DEV_IDESCSI=m CONFIG_IDE_TASK_IOCTL=y CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_IDEPCI=y diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga index a278eb0b4..817e02b14 100644 --- a/debian/arch/m68k/config.amiga +++ b/debian/arch/m68k/config.amiga @@ -42,7 +42,6 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=y # CONFIG_IDE_ARM is not set diff --git a/debian/arch/m68k/config.atari b/debian/arch/m68k/config.atari index 295615e3d..d077fe489 100644 --- a/debian/arch/m68k/config.atari +++ b/debian/arch/m68k/config.atari @@ -34,7 +34,6 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=y # CONFIG_IDE_ARM is not set diff --git a/debian/arch/m68k/config.mac b/debian/arch/m68k/config.mac index 4308488e0..a0566b820 100644 --- a/debian/arch/m68k/config.mac +++ b/debian/arch/m68k/config.mac @@ -28,7 +28,6 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=y # CONFIG_IDE_ARM is not set diff --git a/debian/arch/m68k/config.q40 b/debian/arch/m68k/config.q40 index 76cdcca4c..16231713c 100644 --- a/debian/arch/m68k/config.q40 +++ b/debian/arch/m68k/config.q40 @@ -30,7 +30,6 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=y # CONFIG_IDE_ARM is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 95ee50d85..fd400f9e6 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -142,7 +142,6 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECD=m CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_TASK_IOCTL is not set # CONFIG_IDE_GENERIC is not set CONFIG_BLK_DEV_IDEPCI=y diff --git a/debian/arch/powerpc/config.apus b/debian/arch/powerpc/config.apus index 59bbe849c..6f52b40a0 100644 --- a/debian/arch/powerpc/config.apus +++ b/debian/arch/powerpc/config.apus @@ -250,7 +250,6 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set CONFIG_BLK_DEV_IDEFLOPPY=y -CONFIG_BLK_DEV_IDESCSI=m # CONFIG_IDE_TASK_IOCTL is not set # diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index fdaf64958..b95f9790e 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -67,7 +67,6 @@ CONFIG_BLK_DEV_IDEDISK=m CONFIG_BLK_DEV_IDECD=m CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_IDEPCI=y diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index d60ca20b5..63c35b7a7 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -71,7 +71,6 @@ CONFIG_BLK_DEV_IDEDISK=m CONFIG_BLK_DEV_IDECD=m CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_GENERIC=m CONFIG_BLK_DEV_IDEPCI=y diff --git a/debian/changelog b/debian/changelog index 2c5adee95..50407feda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ linux-2.6 (2.6.13-2) UNRELEASED; urgency=low [ Frederik Schüler ] * deactivate FB_RIVA on all architectures. + * deactivate BLK_DEV_IDESCSI on all architectures. * Added patch-2.6.13.4: - key: plug request_key_auth memleak (CAN-2005-3119) - [SECURITY] Fix drm 'debug' sysfs permissions