From d8e36b079378401858bec5dc227313359009e820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Mon, 2 Oct 2006 13:23:20 +0000 Subject: [PATCH] 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. svn path=/dists/trunk/linux-2.6/; revision=7571 --- debian/arch/alpha/config | 12 ------------ debian/arch/amd64/config | 16 +++------------- debian/arch/arm/config.footbridge | 1 - debian/arch/arm/config.iop32x | 14 -------------- debian/arch/arm/config.ixp4xx | 13 ------------- debian/arch/arm/config.s3c2410 | 1 - debian/arch/armeb/config.nslu2 | 13 ------------- debian/arch/config | 18 ++++++++++++++++-- debian/arch/hppa/config | 13 ------------- debian/arch/i386/config | 14 +------------- debian/arch/ia64/config | 12 ------------ debian/arch/m68k/config | 1 - debian/arch/mips/config.r4k-ip22 | 13 ------------- debian/arch/mips/config.r5k-ip32 | 13 ------------- debian/arch/mips/config.sb1-bcm91250a | 14 -------------- debian/arch/mips/config.sb1a-bcm91480b | 14 -------------- debian/arch/mipsel/config.r3k-kn02 | 1 - debian/arch/mipsel/config.r4k-kn04 | 1 - debian/arch/mipsel/config.r5k-cobalt | 2 -- debian/arch/mipsel/config.sb1-bcm91250a | 14 -------------- debian/arch/mipsel/config.sb1a-bcm91480b | 14 -------------- debian/arch/powerpc/config | 13 +------------ debian/arch/powerpc/config.powerpc-miboot | 2 -- debian/arch/sparc/config | 14 +------------- debian/changelog | 7 ++++++- 25 files changed, 28 insertions(+), 222 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index f5f56e519..4ac278754 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -407,19 +407,7 @@ CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_QOS=y CONFIG_NET_ESTIMATOR=y -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_NET_CLS_IND is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m # CONFIG_NET_EMATCH is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y CONFIG_NET_PKTGEN=m CONFIG_NETPOLL=y diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index bd4fe5c99..23d1187ce 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -377,24 +377,12 @@ CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_ESTIMATOR=y -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_NET_CLS_IND is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m -CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y @@ -1458,4 +1446,6 @@ CONFIG_RESOURCES_64BIT=y CONFIG_IOMMU=y CONFIG_HW_RANDOM_INTEL=m CONFIG_ACPI_SBS=m -CONFIG_SCSI_ARCMSR=m +CONFIG_AUDIT_ARCH=y +# CONFIG_ASFS_FS is not set +CONFIG_SCSI_ARCMSR=m diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index de3876e1d..2990c22aa 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1838,7 +1838,6 @@ CONFIG_BLK_DEV_SC1200=m # CONFIG_IEEE1394_AMDTP is not set CONFIG_BLK_DEV_PDC202XX_OLD=m # CONFIG_LANCE is not set -# CONFIG_NET_CLS_ROUTE is not set CONFIG_VIDEO_TVEEPROM=m # CONFIG_USB_AUDIO is not set CONFIG_VIDEO_IR=m diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index 716d5aa92..2b69a9d12 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -441,21 +441,8 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -# CONFIG_NET_CLS_BASIC is not set -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m # CONFIG_NET_EMATCH is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # @@ -649,7 +636,6 @@ 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 # # IDE chipset support/bugfixes diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index d2db9d1fd..3103f07c2 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -470,21 +470,8 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -# CONFIG_NET_CLS_BASIC is not set -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m # CONFIG_NET_EMATCH is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index d86f452b0..64c72c493 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -1216,7 +1216,6 @@ CONFIG_USB_SERIAL=m # CONFIG_USB_BANDWIDTH is not set CONFIG_PPP=m CONFIG_CRC_CCITT=m -# CONFIG_NET_CLS_ROUTE is not set # CONFIG_LANCE is not set # CONFIG_SCSI_T128 is not set # CONFIG_SCSI_ADVANSYS is not set diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index 84960954f..c40320b5b 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -475,21 +475,8 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -# CONFIG_NET_CLS_BASIC is not set -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m # CONFIG_NET_EMATCH is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # diff --git a/debian/arch/config b/debian/arch/config index 98b216e96..e517fa9b5 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -49,7 +49,6 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_VLAN_8021Q=m -CONFIG_NET_CLS_ROUTE=y CONFIG_NETDEVICES=y CONFIG_BONDING=m CONFIG_EQUALIZER=m @@ -652,7 +651,6 @@ CONFIG_PACKET_MMAP=y CONFIG_MKISS=m CONFIG_VIDEO_BT848_DVB=y CONFIG_ATM_DUMMY=m -# CONFIG_IDE_TASK_IOCTL is not set CONFIG_VIDEO_SAA7134_OSS=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7134_ALSA=m @@ -1037,3 +1035,19 @@ CONFIG_PARPORT_1284=y # CONFIG_EMBEDDED is not set CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=16 +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_IDE_TASK_IOCTL=y +CONFIG_NET_CLS=y +CONFIG_NET_CLS_RSVP=m +CONFIG_CLS_U32_PERF=y +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_IND=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_DVB_PLL=m diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index ceeae18b4..3906f05a8 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -263,25 +263,12 @@ CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_QOS=y CONFIG_NET_ESTIMATOR=y -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y -CONFIG_NET_CLS_IND=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m -CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 94cdd246a..a900565c1 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -474,24 +474,12 @@ CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_ESTIMATOR=y -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_NET_CLS_IND is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y CONFIG_NET_PKTGEN=m CONFIG_NETPOLL=y @@ -1679,7 +1667,7 @@ CONFIG_EDAC_E752X=m CONFIG_EDAC_R82600=m CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_EFI_VARS=y +CONFIG_EFI_VARS=m CONFIG_BOOT_IOREMAP=y CONFIG_EFI=y CONFIG_HW_RANDOM_INTEL=m diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 93b956f32..be3bf1b14 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -367,24 +367,12 @@ CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_QOS=y CONFIG_NET_ESTIMATOR=y -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_NET_CLS_IND is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y CONFIG_NET_PKTGEN=m CONFIG_NETPOLL=y diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 4100bb2ac..57f39d877 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -89,7 +89,6 @@ CONFIG_ATALK=m # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set -CONFIG_NET_CLS_ROUTE=y # CONFIG_NET_PKTGEN is not set CONFIG_NETPOLL=y # CONFIG_NETPOLL_RX is not set diff --git a/debian/arch/mips/config.r4k-ip22 b/debian/arch/mips/config.r4k-ip22 index 2259a2428..2bc50f749 100644 --- a/debian/arch/mips/config.r4k-ip22 +++ b/debian/arch/mips/config.r4k-ip22 @@ -450,17 +450,6 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -468,9 +457,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m # CONFIG_NET_EMATCH_TEXT is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/arch/mips/config.r5k-ip32 index 6d3f65a92..b6d34d098 100644 --- a/debian/arch/mips/config.r5k-ip32 +++ b/debian/arch/mips/config.r5k-ip32 @@ -451,17 +451,6 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -469,9 +458,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m # CONFIG_NET_EMATCH_TEXT is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a index 7eeec0348..b3715bc2b 100644 --- a/debian/arch/mips/config.sb1-bcm91250a +++ b/debian/arch/mips/config.sb1-bcm91250a @@ -471,17 +471,6 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -489,9 +478,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m # CONFIG_NET_EMATCH_TEXT is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # @@ -568,7 +555,6 @@ 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 # # IDE chipset support/bugfixes diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b index 621ba326b..28adb51de 100644 --- a/debian/arch/mips/config.sb1a-bcm91480b +++ b/debian/arch/mips/config.sb1a-bcm91480b @@ -467,17 +467,6 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -485,9 +474,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m # CONFIG_NET_EMATCH_TEXT is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # @@ -564,7 +551,6 @@ 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 # # IDE chipset support/bugfixes diff --git a/debian/arch/mipsel/config.r3k-kn02 b/debian/arch/mipsel/config.r3k-kn02 index cf4e5c5bf..f02813d71 100644 --- a/debian/arch/mipsel/config.r3k-kn02 +++ b/debian/arch/mipsel/config.r3k-kn02 @@ -419,7 +419,6 @@ CONFIG_TIPC_LOG=0 # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set -CONFIG_NET_CLS_ROUTE=y # # Network testing diff --git a/debian/arch/mipsel/config.r4k-kn04 b/debian/arch/mipsel/config.r4k-kn04 index 466fb5418..9b9857739 100644 --- a/debian/arch/mipsel/config.r4k-kn04 +++ b/debian/arch/mipsel/config.r4k-kn04 @@ -421,7 +421,6 @@ CONFIG_TIPC_LOG=0 # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set -CONFIG_NET_CLS_ROUTE=y # # Network testing diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index d4928e6bb..9c763ef2b 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -416,7 +416,6 @@ CONFIG_TIPC_LOG=0 # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set -CONFIG_NET_CLS_ROUTE=y # # Network testing @@ -497,7 +496,6 @@ CONFIG_BLK_DEV_IDEDISK=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set # # IDE chipset support/bugfixes diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index d482c3730..cef2fe9a6 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -471,17 +471,6 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -489,9 +478,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m # CONFIG_NET_EMATCH_TEXT is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # @@ -568,7 +555,6 @@ 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 # # IDE chipset support/bugfixes diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index 73efa3cb3..2416a3f89 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -467,17 +467,6 @@ CONFIG_NET_SCH_INGRESS=m # # Classification # -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -485,9 +474,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m # CONFIG_NET_EMATCH_TEXT is not set -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y -# CONFIG_NET_CLS_IND is not set CONFIG_NET_ESTIMATOR=y # @@ -564,7 +551,6 @@ 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 # # IDE chipset support/bugfixes diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 05cbe24f1..67c61e105 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -299,24 +299,12 @@ CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_QOS=y CONFIG_NET_ESTIMATOR=y -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_NET_CLS_IND is not set -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_EMATCH_META=m -# CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y CONFIG_NET_PKTGEN=m CONFIG_NETPOLL=y @@ -1239,3 +1227,4 @@ CONFIG_XMON=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_IPW2100 is not set CONFIG_HVC_RTAS=y +CONFIG_SCSI_ARCMSR=m diff --git a/debian/arch/powerpc/config.powerpc-miboot b/debian/arch/powerpc/config.powerpc-miboot index 794b6036f..85f11c8cd 100644 --- a/debian/arch/powerpc/config.powerpc-miboot +++ b/debian/arch/powerpc/config.powerpc-miboot @@ -22,7 +22,6 @@ CONFIG_BASE_SMALL=1 # CONFIG_NETFILTER is not set # CONFIG_NET_DIVERT is not set # CONFIG_NET_SCHED is not set -# CONFIG_NET_CLS_ROUTE is not set # CONFIG_NETPOLL_RX is not set # CONFIG_NETPOLL_TRAP is not set # CONFIG_HAMRADIO is not set @@ -73,7 +72,6 @@ CONFIG_IOSCHED_DEADLINE=y # CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="deadline" CONFIG_FB_CONTROL=y CONFIG_FB_PLATINUM=y diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index 38b9d6480..173392d42 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -72,7 +72,6 @@ CONFIG_SUN_IO=y # CONFIG_INPUT_EVBUG is not set CONFIG_NET_SCH_NETEM=m # Wireless LAN (non-hamradio) -CONFIG_VIDEO_V4L2=y # CONFIG_HP100 is not set # I2C support # CONFIG_DVB is not set @@ -82,7 +81,6 @@ CONFIG_INPUT=y # CONFIG_IPMI_HANDLER is not set # RTC interfaces # CONFIG_USB_GADGET is not set -CONFIG_NET_CLS_TCINDEX=m # CONFIG_FB_P9100 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_SND_SERIAL_U16550 is not set @@ -149,7 +147,6 @@ CONFIG_SCSI_LPFC=m CONFIG_NET_POLL_CONTROLLER=y # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_MOUSEDEV=y -CONFIG_NET_CLS_RSVP=m CONFIG_ATALK=m CONFIG_IP_PNP_RARP=y CONFIG_INPUT_MOUSE=y @@ -186,7 +183,6 @@ CONFIG_FB=y # CONFIG_KEYBOARD_XTKBD is not set # Network device support CONFIG_DECNET_ROUTE_FWMARK=y -CONFIG_NET_CLS_FW=m CONFIG_PPPOE=m CONFIG_NET_SCH_PRIO=m CONFIG_AFFS_FS=m @@ -277,9 +273,7 @@ CONFIG_SND_SUN_AMD7930=m # CONFIG_SND_ICE1712 is not set # Ftape, the floppy tape device driver # PHY device support -# CONFIG_CLS_U32_MARK is not set # CONFIG_INFINIBAND is not set -# CONFIG_CLS_U32_PERF is not set # CONFIG_FB_NVIDIA is not set # CONFIG_NET_RADIO is not set # CONFIG_VXFS_FS is not set @@ -357,7 +351,6 @@ CONFIG_SPARC=y # CONFIG_R8169 is not set CONFIG_FONT_SUN8x16=y CONFIG_BNX2=m -# CONFIG_NET_CLS_IND is not set # CONFIG_FB_RIVA is not set # CONFIG_MTD is not set # CONFIG_ULTRIX_PARTITION is not set @@ -380,10 +373,7 @@ CONFIG_NET_SCH_RED=m # CONFIG_IP_PNP_DHCP is not set # TIPC Configuration (EXPERIMENTAL) # CONFIG_CIFS_STATS is not set -CONFIG_NET_CLS=y -# CONFIG_NET_CLS_ACT is not set # CONFIG_FONTS is not set -CONFIG_NET_CLS_RSVP6=m # Network testing # CONFIG_INPUT_TSDEV is not set # Pseudo filesystems @@ -410,15 +400,12 @@ CONFIG_HFS_FS=m CONFIG_SERIO=y # Fusion MPT device support # CONFIG_AMIGA_PARTITION is not set -CONFIG_NET_CLS_ROUTE4=m # Parallel port support # CONFIG_SND_ICE1724 is not set -CONFIG_NET_CLS_BASIC=m CONFIG_HW_CONSOLE=y # SPI Master Controller Drivers # CONFIG_BSD_DISKLABEL is not set # CONFIG_FB_SAVAGE is not set -CONFIG_NET_CLS_U32=m CONFIG_GENERIC_FIND_NEXT_BIT=y # CONFIG_NETPOLL_RX is not set # CONFIG_FB_MATROX is not set @@ -440,3 +427,4 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_SND_HDA_INTEL is not set # MII PHY device drivers # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set +CONFIG_SCSI_ARCMSR=m diff --git a/debian/changelog b/debian/changelog index 9f35616b3..a1b612a76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,12 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low * [alpha] restore alpha-prctl.patch, which keeps disappearing every time there's a kernel upgrade :/ - -- Steve Langasek Sat, 30 Sep 2006 02:28:29 -0700 + [ 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. + -- Frederik Schüler Mon, 2 Oct 2006 15:17:27 +0200 linux-2.6 (2.6.18-2) unstable; urgency=low