aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2014-11-27 10:28:16 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-30 00:13:48 -0500
commitcd4c910e00751a451b34476c52eb17f904a844b6 (patch)
tree1b70ba70b41f223d6b5ba71f943ceb58820f7472
parent265de6d19cdd56745bf2277f0bc81ba5109b8717 (diff)
netpoll: delete defconfig references to obsolete NETPOLL_TRAP
In commit 9c62a68d13119a1ca9718381d97b0cb415ff4e9d ("netpoll: Remove dead packet receive code (CONFIG_NETPOLL_TRAP)") this Kconfig option was removed. So remove references to it from all defconfigs as well. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--arch/arm/configs/davinci_all_defconfig1
-rw-r--r--arch/powerpc/configs/85xx/ge_imp3a_defconfig1
-rw-r--r--arch/powerpc/configs/86xx/gef_ppc9a_defconfig1
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc310_defconfig1
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig1
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig1
-rw-r--r--arch/powerpc/configs/c2k_defconfig1
-rw-r--r--arch/powerpc/configs/ppc64_defconfig1
-rw-r--r--arch/powerpc/configs/ppc64e_defconfig1
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig1
-rw-r--r--arch/powerpc/configs/pseries_defconfig1
-rw-r--r--arch/powerpc/configs/pseries_le_defconfig1
-rw-r--r--arch/tile/configs/tilegx_defconfig1
-rw-r--r--arch/tile/configs/tilepro_defconfig1
14 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index f95f72d62db7..759f9b0053e2 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -97,7 +97,6 @@ CONFIG_PPP_ASYNC=m
97CONFIG_PPP_SYNC_TTY=m 97CONFIG_PPP_SYNC_TTY=m
98CONFIG_PPP_DEFLATE=m 98CONFIG_PPP_DEFLATE=m
99CONFIG_NETCONSOLE=y 99CONFIG_NETCONSOLE=y
100CONFIG_NETPOLL_TRAP=y
101# CONFIG_INPUT_MOUSEDEV is not set 100# CONFIG_INPUT_MOUSEDEV is not set
102CONFIG_INPUT_EVDEV=m 101CONFIG_INPUT_EVDEV=m
103CONFIG_INPUT_EVBUG=m 102CONFIG_INPUT_EVBUG=m
diff --git a/arch/powerpc/configs/85xx/ge_imp3a_defconfig b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
index dc939de9b5b0..b4c4b469e320 100644
--- a/arch/powerpc/configs/85xx/ge_imp3a_defconfig
+++ b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
@@ -100,7 +100,6 @@ CONFIG_NETDEVICES=y
100CONFIG_BONDING=m 100CONFIG_BONDING=m
101CONFIG_DUMMY=m 101CONFIG_DUMMY=m
102CONFIG_NETCONSOLE=y 102CONFIG_NETCONSOLE=y
103CONFIG_NETPOLL_TRAP=y
104CONFIG_TUN=m 103CONFIG_TUN=m
105# CONFIG_NET_VENDOR_3COM is not set 104# CONFIG_NET_VENDOR_3COM is not set
106CONFIG_FS_ENET=y 105CONFIG_FS_ENET=y
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index e5a648115ada..7cb9719abf3d 100644
--- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
@@ -113,7 +113,6 @@ CONFIG_SLIP_COMPRESSED=y
113CONFIG_SLIP_SMART=y 113CONFIG_SLIP_SMART=y
114CONFIG_SLIP_MODE_SLIP6=y 114CONFIG_SLIP_MODE_SLIP6=y
115CONFIG_NETCONSOLE=y 115CONFIG_NETCONSOLE=y
116CONFIG_NETPOLL_TRAP=y
117# CONFIG_INPUT_KEYBOARD is not set 116# CONFIG_INPUT_KEYBOARD is not set
118# CONFIG_INPUT_MOUSE is not set 117# CONFIG_INPUT_MOUSE is not set
119# CONFIG_SERIO is not set 118# CONFIG_SERIO is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
index 8317b6010ba6..ecabf625d249 100644
--- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
@@ -114,7 +114,6 @@ CONFIG_SLIP_COMPRESSED=y
114CONFIG_SLIP_SMART=y 114CONFIG_SLIP_SMART=y
115CONFIG_SLIP_MODE_SLIP6=y 115CONFIG_SLIP_MODE_SLIP6=y
116CONFIG_NETCONSOLE=y 116CONFIG_NETCONSOLE=y
117CONFIG_NETPOLL_TRAP=y
118# CONFIG_INPUT_KEYBOARD is not set 117# CONFIG_INPUT_KEYBOARD is not set
119# CONFIG_INPUT_MOUSE is not set 118# CONFIG_INPUT_MOUSE is not set
120# CONFIG_SERIO is not set 119# CONFIG_SERIO is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 124d66f0282c..4a4a86fb0d3d 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -165,7 +165,6 @@ CONFIG_SLIP_COMPRESSED=y
165CONFIG_SLIP_SMART=y 165CONFIG_SLIP_SMART=y
166CONFIG_SLIP_MODE_SLIP6=y 166CONFIG_SLIP_MODE_SLIP6=y
167CONFIG_NETCONSOLE=y 167CONFIG_NETCONSOLE=y
168CONFIG_NETPOLL_TRAP=y
169CONFIG_INPUT_FF_MEMLESS=m 168CONFIG_INPUT_FF_MEMLESS=m
170# CONFIG_INPUT_KEYBOARD is not set 169# CONFIG_INPUT_KEYBOARD is not set
171# CONFIG_INPUT_MOUSE is not set 170# CONFIG_INPUT_MOUSE is not set
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index 1e151594c691..99ea8746bbaf 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -167,7 +167,6 @@ CONFIG_SLIP_COMPRESSED=y
167CONFIG_SLIP_SMART=y 167CONFIG_SLIP_SMART=y
168CONFIG_SLIP_MODE_SLIP6=y 168CONFIG_SLIP_MODE_SLIP6=y
169CONFIG_NETCONSOLE=y 169CONFIG_NETCONSOLE=y
170CONFIG_NETPOLL_TRAP=y
171# CONFIG_INPUT_KEYBOARD is not set 170# CONFIG_INPUT_KEYBOARD is not set
172# CONFIG_INPUT_MOUSE is not set 171# CONFIG_INPUT_MOUSE is not set
173# CONFIG_SERIO is not set 172# CONFIG_SERIO is not set
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 59734916986a..8a08d6dcb0b4 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -211,7 +211,6 @@ CONFIG_MV643XX_ETH=y
211# CONFIG_NETDEV_10000 is not set 211# CONFIG_NETDEV_10000 is not set
212# CONFIG_ATM_DRIVERS is not set 212# CONFIG_ATM_DRIVERS is not set
213CONFIG_NETCONSOLE=m 213CONFIG_NETCONSOLE=m
214CONFIG_NETPOLL_TRAP=y
215# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 214# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
216CONFIG_INPUT_EVDEV=y 215CONFIG_INPUT_EVDEV=y
217# CONFIG_INPUT_KEYBOARD is not set 216# CONFIG_INPUT_KEYBOARD is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 20bc5e2d368d..5830d735c5c3 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -154,7 +154,6 @@ CONFIG_WINDFARM_PM121=y
154CONFIG_BONDING=m 154CONFIG_BONDING=m
155CONFIG_DUMMY=m 155CONFIG_DUMMY=m
156CONFIG_NETCONSOLE=y 156CONFIG_NETCONSOLE=y
157CONFIG_NETPOLL_TRAP=y
158CONFIG_TUN=m 157CONFIG_TUN=m
159CONFIG_VIRTIO_NET=m 158CONFIG_VIRTIO_NET=m
160CONFIG_VHOST_NET=m 159CONFIG_VHOST_NET=m
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index c3a3269b0865..67885b2d70aa 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -103,7 +103,6 @@ CONFIG_NETDEVICES=y
103CONFIG_BONDING=m 103CONFIG_BONDING=m
104CONFIG_DUMMY=m 104CONFIG_DUMMY=m
105CONFIG_NETCONSOLE=y 105CONFIG_NETCONSOLE=y
106CONFIG_NETPOLL_TRAP=y
107CONFIG_TUN=m 106CONFIG_TUN=m
108CONFIG_VORTEX=y 107CONFIG_VORTEX=y
109CONFIG_ACENIC=y 108CONFIG_ACENIC=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index fec5870f1818..ad6d6b5af7d7 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -629,7 +629,6 @@ CONFIG_SLIP_SMART=y
629CONFIG_NET_FC=y 629CONFIG_NET_FC=y
630CONFIG_NETCONSOLE=m 630CONFIG_NETCONSOLE=m
631CONFIG_NETCONSOLE_DYNAMIC=y 631CONFIG_NETCONSOLE_DYNAMIC=y
632CONFIG_NETPOLL_TRAP=y
633CONFIG_VIRTIO_NET=m 632CONFIG_VIRTIO_NET=m
634# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 633# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
635CONFIG_INPUT_JOYDEV=m 634CONFIG_INPUT_JOYDEV=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index dd2a9cab4b50..1f97364017c7 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -133,7 +133,6 @@ CONFIG_DM_UEVENT=y
133CONFIG_BONDING=m 133CONFIG_BONDING=m
134CONFIG_DUMMY=m 134CONFIG_DUMMY=m
135CONFIG_NETCONSOLE=y 135CONFIG_NETCONSOLE=y
136CONFIG_NETPOLL_TRAP=y
137CONFIG_TUN=m 136CONFIG_TUN=m
138CONFIG_VIRTIO_NET=m 137CONFIG_VIRTIO_NET=m
139CONFIG_VHOST_NET=m 138CONFIG_VHOST_NET=m
diff --git a/arch/powerpc/configs/pseries_le_defconfig b/arch/powerpc/configs/pseries_le_defconfig
index d2008887eb8c..ac7ca5852827 100644
--- a/arch/powerpc/configs/pseries_le_defconfig
+++ b/arch/powerpc/configs/pseries_le_defconfig
@@ -134,7 +134,6 @@ CONFIG_DM_UEVENT=y
134CONFIG_BONDING=m 134CONFIG_BONDING=m
135CONFIG_DUMMY=m 135CONFIG_DUMMY=m
136CONFIG_NETCONSOLE=y 136CONFIG_NETCONSOLE=y
137CONFIG_NETPOLL_TRAP=y
138CONFIG_TUN=m 137CONFIG_TUN=m
139CONFIG_VIRTIO_NET=m 138CONFIG_VIRTIO_NET=m
140CONFIG_VHOST_NET=m 139CONFIG_VHOST_NET=m
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 91de7dd7427f..37dc9364c4a1 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -218,7 +218,6 @@ CONFIG_MACVLAN=m
218CONFIG_MACVTAP=m 218CONFIG_MACVTAP=m
219CONFIG_NETCONSOLE=m 219CONFIG_NETCONSOLE=m
220CONFIG_NETCONSOLE_DYNAMIC=y 220CONFIG_NETCONSOLE_DYNAMIC=y
221CONFIG_NETPOLL_TRAP=y
222CONFIG_TUN=y 221CONFIG_TUN=y
223CONFIG_VETH=m 222CONFIG_VETH=m
224CONFIG_NET_DSA_MV88E6060=y 223CONFIG_NET_DSA_MV88E6060=y
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index c7702b7ab7a5..76a2781dec2c 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -337,7 +337,6 @@ CONFIG_MACVLAN=m
337CONFIG_MACVTAP=m 337CONFIG_MACVTAP=m
338CONFIG_NETCONSOLE=m 338CONFIG_NETCONSOLE=m
339CONFIG_NETCONSOLE_DYNAMIC=y 339CONFIG_NETCONSOLE_DYNAMIC=y
340CONFIG_NETPOLL_TRAP=y
341CONFIG_TUN=y 340CONFIG_TUN=y
342CONFIG_VETH=m 341CONFIG_VETH=m
343CONFIG_NET_DSA_MV88E6060=y 342CONFIG_NET_DSA_MV88E6060=y
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 11:06:21 -0500