From 5fe888b7ec0d60dfc8722a14f74e7749b23af533 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 25 May 2015 02:16:00 +0000 Subject: [PATCH] i2o: Disable I2O svn path=/dists/sid/linux/; revision=22700 --- debian/changelog | 1 + debian/config/alpha/config | 9 --------- debian/config/config | 14 +++++--------- debian/config/hppa/config | 9 --------- debian/config/ia64/config | 9 --------- debian/config/kernelarch-mips/config.4kc-malta | 9 --------- debian/config/kernelarch-mips/config.5kc-malta | 9 --------- debian/config/kernelarch-powerpc/config | 9 --------- debian/config/kernelarch-sparc/config | 5 ----- debian/config/kernelarch-x86/config | 9 --------- 10 files changed, 6 insertions(+), 77 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1cefdcb54..74809afd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -154,6 +154,7 @@ linux (4.0.4-1) UNRELEASED; urgency=medium * [armel/{kirkwood,orion5x}] Disable PM again to reduce kernel image size * [armel/kirkwood] Enable DEBUG_MVEBU_UART0_ALTERNATE, replacing DEBUG_MVEBU_UART_ALTERNATE + * i2o: Disable I2O [ Ian Campbell ] * [armhf+arm64] Enabled generic SYSCON regmap reset driver diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 7f97b949b..383469ff3 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -392,15 +392,6 @@ CONFIG_RADIO_TRUST=m CONFIG_RADIO_TYPHOON=m CONFIG_RADIO_ZOLTRIX=m -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O=m -CONFIG_I2O_CONFIG=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - ## ## file: drivers/mmc/Kconfig ## diff --git a/debian/config/config b/debian/config/config index a68374a18..53b2ecfa2 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2117,15 +2117,6 @@ CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m # CONFIG_FUSION_LOGGING is not set -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_EXT_ADAPTEC_DMA64=y -CONFIG_I2O_CONFIG_OLD_IOCTL=y -CONFIG_I2O_BUS=m - ## ## file: drivers/mfd/Kconfig ## @@ -3787,6 +3778,11 @@ CONFIG_STAGING=y ## # CONFIG_GS_FPGABOOT is not set +## +## file: drivers/staging/i2o/Kconfig +## +# CONFIG_I2O is not set + ## ## file: drivers/staging/iio/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 51525764d..795308cf6 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -152,15 +152,6 @@ CONFIG_SERIO_RAW=m ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O=m -CONFIG_I2O_CONFIG=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - ## ## file: drivers/mfd/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index f90716336..cf9e5eebd 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -373,15 +373,6 @@ CONFIG_ISDN_DIVAS_MAINT=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O=m -CONFIG_I2O_CONFIG=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - ## ## file: drivers/mmc/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta index 2b438cdeb..e175cb8ab 100644 --- a/debian/config/kernelarch-mips/config.4kc-malta +++ b/debian/config/kernelarch-mips/config.4kc-malta @@ -159,15 +159,6 @@ CONFIG_SERIO_RAW=m ## CONFIG_INPUT_TOUCHSCREEN=y -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O=m -CONFIG_I2O_CONFIG=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - ## ## file: drivers/mfd/Kconfig ## diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta index f443179d8..3a02751b6 100644 --- a/debian/config/kernelarch-mips/config.5kc-malta +++ b/debian/config/kernelarch-mips/config.5kc-malta @@ -162,15 +162,6 @@ CONFIG_SERIO_RAW=m ## CONFIG_INPUT_TOUCHSCREEN=y -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O=m -CONFIG_I2O_CONFIG=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - ## ## file: drivers/mfd/Kconfig ## diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config index 8fd324ddb..b9a5cf1ae 100644 --- a/debian/config/kernelarch-powerpc/config +++ b/debian/config/kernelarch-powerpc/config @@ -399,15 +399,6 @@ CONFIG_PMAC_RACKMETER=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O=m -CONFIG_I2O_CONFIG=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - ## ## file: drivers/misc/Kconfig ## diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config index 4ff9c1677..bb3c79dec 100644 --- a/debian/config/kernelarch-sparc/config +++ b/debian/config/kernelarch-sparc/config @@ -247,11 +247,6 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_USB_DSBR is not set # CONFIG_RADIO_MAXIRADIO is not set -## -## file: drivers/message/i2o/Kconfig -## -# CONFIG_I2O is not set - ## ## file: drivers/mmc/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 00e938e69..055d24637 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -786,15 +786,6 @@ CONFIG_VIDEO_TM6000=m CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m -## -## file: drivers/message/i2o/Kconfig -## -CONFIG_I2O=m -CONFIG_I2O_CONFIG=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - ## ## file: drivers/mfd/Kconfig ##