diff mbox

[4/9] UBUNTU: [Config] disable DEPRECATED config options

Message ID 1341983498-27856-5-git-send-email-bryan.wu@canonical.com
State New
Headers show

Commit Message

Bryan Wu July 11, 2012, 5:11 a.m. UTC 
CONFIG_BRIDGE_EBT_ULOG
CONFIG_I2O_CONFIG_OLD_IOCTL
CONFIG_IP_NF_QUEUE
CONFIG_MTD_DOC2000
CONFIG_MTD_DOC2001
CONFIG_PRINT_QUOTA_WARNING
CONFIG_PRISM54
CONFIG_WAN_ROUTER
CONFIG_SCx200_I2C

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |  1 -
 debian.master/config/armel/config.common.armel     |  1 -
 debian.master/config/armhf/config.common.armhf     |  1 -
 debian.master/config/config.common.ubuntu          | 22 +++++++++-------------
 debian.master/config/i386/config.common.i386       |  1 -
 debian.master/config/powerpc/config.common.powerpc |  1 -
 debian.master/config/ppc64/config.common.ppc64     |  1 -
 7 files changed, 9 insertions(+), 19 deletions(-)

Comments

Tim Gardner July 11, 2012, 3:23 p.m. UTC | #1 
All but CONFIG_WAN_ROUTER. I think removal of that one might be a bit
premature.
diff mbox

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5432c02..6e9d55e 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -195,7 +195,6 @@  CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_RCU_FANOUT=64
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index eedf0a3..6c92210 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -205,7 +205,6 @@  CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
-CONFIG_PRINT_QUOTA_WARNING=y
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_REGULATOR_DEBUG is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index ae47a02..65633e3 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -66,7 +66,6 @@  CONFIG_PANEL_TFP410=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_WAKELOCKS=y
-CONFIG_PRINT_QUOTA_WARNING=y
 CONFIG_RCU_FANOUT=32
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 0704f59..9b5dccd 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -700,7 +700,7 @@  CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_STP=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
 CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_ULOG=m
+# CONFIG_BRIDGE_EBT_ULOG is not set
 CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_NETFILTER=y
@@ -1220,8 +1220,6 @@  CONFIG_CS89x0_PLATFORM=y
 CONFIG_CUSE=m
 CONFIG_CXT1E1=m
 CONFIG_CYCLADES=m
-CONFIG_CYCLADES_SYNC=m
-CONFIG_CYCLOMX_X25=y
 # CONFIG_CYZ_INTR is not set
 CONFIG_DA9052_WATCHDOG=m
 CONFIG_DAVICOM_PHY=y
@@ -2319,7 +2317,7 @@  CONFIG_I2O=m
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_BUS=m
 CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
 CONFIG_I2O_EXT_ADAPTEC=y
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
@@ -2628,7 +2626,7 @@  CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_QUEUE=m
+# CONFIG_IP_NF_QUEUE is not set
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
@@ -3358,8 +3356,8 @@  CONFIG_MTD_COMPLEX_MAPPINGS=y
 CONFIG_MTD_DATAFLASH=m
 CONFIG_MTD_DATAFLASH_OTP=y
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
 CONFIG_MTD_DOC2001PLUS=m
 CONFIG_MTD_DOCECC=m
 CONFIG_MTD_DOCG3=m
@@ -4253,9 +4251,10 @@  CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTER=m
 CONFIG_PRINTK=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PRISM2_USB=m
-CONFIG_PRISM54=m
+# CONFIG_PRISM54 is not set
 CONFIG_PROBE_EVENTS=y
 CONFIG_PROCESSOR_SELECT=y
 CONFIG_PROC_DEVICETREE=y
@@ -4733,9 +4732,7 @@  CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m
 CONFIG_SCx200_ACB=m
 CONFIG_SCx200_GPIO=m
-CONFIG_SCx200_I2C=m
-CONFIG_SCx200_I2C_SCL=12
-CONFIG_SCx200_I2C_SDA=13
+# CONFIG_SCx200_I2C is not set
 CONFIG_SCx200_WDT=m
 CONFIG_SDIO_UART=m
 CONFIG_SDLA=m
@@ -6235,8 +6232,7 @@  CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_WAFER_WDT=m
 CONFIG_WANXL=m
-CONFIG_WAN_ROUTER=m
-CONFIG_WAN_ROUTER_DRIVERS=m
+# CONFIG_WAN_ROUTER is not set
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_RTAS=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 1bf5ced..a22ccfc 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -194,7 +194,6 @@  CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_RCU_FANOUT=32
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index ddefe3c..4d90a76 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -185,7 +185,6 @@  CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSERIES_ENERGY=m
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 64f0806..7b1eb4f 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -218,7 +218,6 @@  CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PSERIES_ENERGY=y
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y