From 198b4c804827523f6b76f3fa41d3253dfa8fce24 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 3 Aug 2014 19:38:47 +0000
Subject: [PATCH] debian/config: Remove some options that are gone for good

svn path=/dists/trunk/linux/; revision=21672
---
 debian/config/alpha/config              | 1 -
 debian/config/armel/config.ixp4xx       | 1 -
 debian/config/armel/config.kirkwood     | 1 -
 debian/config/armel/config.versatile    | 1 -
 debian/config/config                    | 3 ---
 debian/config/hppa/config               | 5 -----
 debian/config/kernelarch-powerpc/config | 6 ------
 debian/config/kernelarch-sparc/config   | 5 -----
 debian/config/kernelarch-x86/config     | 1 -
 9 files changed, 24 deletions(-)

diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 13f81054e..43e7d8ba4 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -1108,5 +1108,4 @@ CONFIG_MTD_DOCPROBE_55AA=y
 CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
 CONFIG_MTD_DOCPROBE_ADVANCED=y
 CONFIG_MTD_DOCPROBE_HIGH=y
-CONFIG_NETPOLL_TRAP=y
 
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index 1333e0465..8d618b2bb 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -386,7 +386,6 @@ CONFIG_MTD_NAND=m
 ## file: drivers/net/Kconfig
 ##
 # CONFIG_NET_FC is not set
-# CONFIG_NETPOLL_TRAP is not set
 
 ##
 ## file: drivers/net/arcnet/Kconfig
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index b743bc7fe..68b8d0e6f 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -690,5 +690,4 @@ CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_TOPKICK_DT=y
 CONFIG_MACH_TS219_DT=y
 # CONFIG_MTD_ALAUDA is not set
-CONFIG_PROC_DEVICETREE=y
 
diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
index 845238f71..71af8c1f1 100644
--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@@ -460,6 +460,5 @@ CONFIG_IPX_INTERN=y
 ##
 ## file: unknown
 ##
-# CONFIG_NETPOLL_TRAP is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 
diff --git a/debian/config/config b/debian/config/config
index d5f870ae8..ed32461e9 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5936,7 +5936,6 @@ CONFIG_RD_LZ4=y
 ##
 ## file: unknown
 ##
-# CONFIG_ARPD is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 # CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
@@ -5946,7 +5945,6 @@ CONFIG_DVB_USB_IT913X=m
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_GPIO_LANGWELL is not set
-CONFIG_IPV6_PRIVACY=y
 CONFIG_IWLWIFI_P2P=y
 CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MLX5_DEBUG=y
@@ -5955,7 +5953,6 @@ CONFIG_MTD_ALAUDA=m
 CONFIG_MTD_BLKDEVS=m
 # CONFIG_OMAP_CONTROL_USB is not set
 # CONFIG_OMAP_USB3 is not set
-CONFIG_PROC_DEVICETREE=y
 # CONFIG_R8187SE is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_UIO_PDRV is not set
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 2cc1060fd..73a2c9dd3 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -721,8 +721,3 @@ CONFIG_SND_HARMONY=m
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
-##
-## file: unknown
-##
-# CONFIG_NETPOLL_TRAP is not set
-
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index fa465a384..90b8f69e3 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -1013,9 +1013,3 @@ CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
-##
-## file: unknown
-##
-CONFIG_NETPOLL_TRAP=y
-CONFIG_PROC_DEVICETREE=y
-
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index 30d1c8a86..207e2e832 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -642,8 +642,3 @@ CONFIG_SND_SUN_AMD7930=m
 CONFIG_SND_SUN_CS4231=m
 CONFIG_SND_SUN_DBRI=m
 
-##
-## file: unknown
-##
-# CONFIG_NETPOLL_TRAP is not set
-
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 8cf7b8ad6..0fa83fb5b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1883,7 +1883,6 @@ CONFIG_ASUS_OLED=m
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_MTD_DOCPROBE_ADDRESS=0
 # CONFIG_MTD_DOCPROBE_ADVANCED is not set
-# CONFIG_NETPOLL_TRAP is not set
 CONFIG_R8187SE=m
 CONFIG_R8192EE=m
 CONFIG_SND_HDA_I915=y