Skip to content

Commit cd4c910

Browse files
Paul Gortmakerdavem330
authored andcommitted
netpoll: delete defconfig references to obsolete NETPOLL_TRAP
In commit 9c62a68 ("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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 265de6d commit cd4c910

14 files changed

+0
-14
lines changed

arch/arm/configs/davinci_all_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ CONFIG_PPP_ASYNC=m
9797
CONFIG_PPP_SYNC_TTY=m
9898
CONFIG_PPP_DEFLATE=m
9999
CONFIG_NETCONSOLE=y
100-
CONFIG_NETPOLL_TRAP=y
101100
# CONFIG_INPUT_MOUSEDEV is not set
102101
CONFIG_INPUT_EVDEV=m
103102
CONFIG_INPUT_EVBUG=m

arch/powerpc/configs/85xx/ge_imp3a_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_NETDEVICES=y
100100
CONFIG_BONDING=m
101101
CONFIG_DUMMY=m
102102
CONFIG_NETCONSOLE=y
103-
CONFIG_NETPOLL_TRAP=y
104103
CONFIG_TUN=m
105104
# CONFIG_NET_VENDOR_3COM is not set
106105
CONFIG_FS_ENET=y

arch/powerpc/configs/86xx/gef_ppc9a_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ CONFIG_SLIP_COMPRESSED=y
113113
CONFIG_SLIP_SMART=y
114114
CONFIG_SLIP_MODE_SLIP6=y
115115
CONFIG_NETCONSOLE=y
116-
CONFIG_NETPOLL_TRAP=y
117116
# CONFIG_INPUT_KEYBOARD is not set
118117
# CONFIG_INPUT_MOUSE is not set
119118
# CONFIG_SERIO is not set

arch/powerpc/configs/86xx/gef_sbc310_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ CONFIG_SLIP_COMPRESSED=y
114114
CONFIG_SLIP_SMART=y
115115
CONFIG_SLIP_MODE_SLIP6=y
116116
CONFIG_NETCONSOLE=y
117-
CONFIG_NETPOLL_TRAP=y
118117
# CONFIG_INPUT_KEYBOARD is not set
119118
# CONFIG_INPUT_MOUSE is not set
120119
# CONFIG_SERIO is not set

arch/powerpc/configs/86xx/gef_sbc610_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ CONFIG_SLIP_COMPRESSED=y
165165
CONFIG_SLIP_SMART=y
166166
CONFIG_SLIP_MODE_SLIP6=y
167167
CONFIG_NETCONSOLE=y
168-
CONFIG_NETPOLL_TRAP=y
169168
CONFIG_INPUT_FF_MEMLESS=m
170169
# CONFIG_INPUT_KEYBOARD is not set
171170
# CONFIG_INPUT_MOUSE is not set

arch/powerpc/configs/86xx/sbc8641d_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ CONFIG_SLIP_COMPRESSED=y
167167
CONFIG_SLIP_SMART=y
168168
CONFIG_SLIP_MODE_SLIP6=y
169169
CONFIG_NETCONSOLE=y
170-
CONFIG_NETPOLL_TRAP=y
171170
# CONFIG_INPUT_KEYBOARD is not set
172171
# CONFIG_INPUT_MOUSE is not set
173172
# CONFIG_SERIO is not set

arch/powerpc/configs/c2k_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ CONFIG_MV643XX_ETH=y
211211
# CONFIG_NETDEV_10000 is not set
212212
# CONFIG_ATM_DRIVERS is not set
213213
CONFIG_NETCONSOLE=m
214-
CONFIG_NETPOLL_TRAP=y
215214
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
216215
CONFIG_INPUT_EVDEV=y
217216
# CONFIG_INPUT_KEYBOARD is not set

arch/powerpc/configs/ppc64_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ CONFIG_WINDFARM_PM121=y
154154
CONFIG_BONDING=m
155155
CONFIG_DUMMY=m
156156
CONFIG_NETCONSOLE=y
157-
CONFIG_NETPOLL_TRAP=y
158157
CONFIG_TUN=m
159158
CONFIG_VIRTIO_NET=m
160159
CONFIG_VHOST_NET=m

arch/powerpc/configs/ppc64e_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ CONFIG_NETDEVICES=y
103103
CONFIG_BONDING=m
104104
CONFIG_DUMMY=m
105105
CONFIG_NETCONSOLE=y
106-
CONFIG_NETPOLL_TRAP=y
107106
CONFIG_TUN=m
108107
CONFIG_VORTEX=y
109108
CONFIG_ACENIC=y

arch/powerpc/configs/ppc6xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,6 @@ CONFIG_SLIP_SMART=y
629629
CONFIG_NET_FC=y
630630
CONFIG_NETCONSOLE=m
631631
CONFIG_NETCONSOLE_DYNAMIC=y
632-
CONFIG_NETPOLL_TRAP=y
633632
CONFIG_VIRTIO_NET=m
634633
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
635634
CONFIG_INPUT_JOYDEV=m

arch/powerpc/configs/pseries_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ CONFIG_DM_UEVENT=y
133133
CONFIG_BONDING=m
134134
CONFIG_DUMMY=m
135135
CONFIG_NETCONSOLE=y
136-
CONFIG_NETPOLL_TRAP=y
137136
CONFIG_TUN=m
138137
CONFIG_VIRTIO_NET=m
139138
CONFIG_VHOST_NET=m

arch/powerpc/configs/pseries_le_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ CONFIG_DM_UEVENT=y
134134
CONFIG_BONDING=m
135135
CONFIG_DUMMY=m
136136
CONFIG_NETCONSOLE=y
137-
CONFIG_NETPOLL_TRAP=y
138137
CONFIG_TUN=m
139138
CONFIG_VIRTIO_NET=m
140139
CONFIG_VHOST_NET=m

arch/tile/configs/tilegx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ CONFIG_MACVLAN=m
218218
CONFIG_MACVTAP=m
219219
CONFIG_NETCONSOLE=m
220220
CONFIG_NETCONSOLE_DYNAMIC=y
221-
CONFIG_NETPOLL_TRAP=y
222221
CONFIG_TUN=y
223222
CONFIG_VETH=m
224223
CONFIG_NET_DSA_MV88E6060=y

arch/tile/configs/tilepro_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ CONFIG_MACVLAN=m
337337
CONFIG_MACVTAP=m
338338
CONFIG_NETCONSOLE=m
339339
CONFIG_NETCONSOLE_DYNAMIC=y
340-
CONFIG_NETPOLL_TRAP=y
341340
CONFIG_TUN=y
342341
CONFIG_VETH=m
343342
CONFIG_NET_DSA_MV88E6060=y

0 commit comments

Comments
 (0)