diff options
-rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/86xx/sbc8641d_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/c2k_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc64e_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc6xx_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_le_defconfig | 1 | ||||
-rw-r--r-- | arch/tile/configs/tilegx_defconfig | 1 | ||||
-rw-r--r-- | arch/tile/configs/tilepro_defconfig | 1 |
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 | |||
97 | CONFIG_PPP_SYNC_TTY=m | 97 | CONFIG_PPP_SYNC_TTY=m |
98 | CONFIG_PPP_DEFLATE=m | 98 | CONFIG_PPP_DEFLATE=m |
99 | CONFIG_NETCONSOLE=y | 99 | CONFIG_NETCONSOLE=y |
100 | CONFIG_NETPOLL_TRAP=y | ||
101 | # CONFIG_INPUT_MOUSEDEV is not set | 100 | # CONFIG_INPUT_MOUSEDEV is not set |
102 | CONFIG_INPUT_EVDEV=m | 101 | CONFIG_INPUT_EVDEV=m |
103 | CONFIG_INPUT_EVBUG=m | 102 | CONFIG_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 | |||
100 | CONFIG_BONDING=m | 100 | CONFIG_BONDING=m |
101 | CONFIG_DUMMY=m | 101 | CONFIG_DUMMY=m |
102 | CONFIG_NETCONSOLE=y | 102 | CONFIG_NETCONSOLE=y |
103 | CONFIG_NETPOLL_TRAP=y | ||
104 | CONFIG_TUN=m | 103 | CONFIG_TUN=m |
105 | # CONFIG_NET_VENDOR_3COM is not set | 104 | # CONFIG_NET_VENDOR_3COM is not set |
106 | CONFIG_FS_ENET=y | 105 | CONFIG_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 | |||
113 | CONFIG_SLIP_SMART=y | 113 | CONFIG_SLIP_SMART=y |
114 | CONFIG_SLIP_MODE_SLIP6=y | 114 | CONFIG_SLIP_MODE_SLIP6=y |
115 | CONFIG_NETCONSOLE=y | 115 | CONFIG_NETCONSOLE=y |
116 | CONFIG_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 | |||
114 | CONFIG_SLIP_SMART=y | 114 | CONFIG_SLIP_SMART=y |
115 | CONFIG_SLIP_MODE_SLIP6=y | 115 | CONFIG_SLIP_MODE_SLIP6=y |
116 | CONFIG_NETCONSOLE=y | 116 | CONFIG_NETCONSOLE=y |
117 | CONFIG_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 | |||
165 | CONFIG_SLIP_SMART=y | 165 | CONFIG_SLIP_SMART=y |
166 | CONFIG_SLIP_MODE_SLIP6=y | 166 | CONFIG_SLIP_MODE_SLIP6=y |
167 | CONFIG_NETCONSOLE=y | 167 | CONFIG_NETCONSOLE=y |
168 | CONFIG_NETPOLL_TRAP=y | ||
169 | CONFIG_INPUT_FF_MEMLESS=m | 168 | CONFIG_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 | |||
167 | CONFIG_SLIP_SMART=y | 167 | CONFIG_SLIP_SMART=y |
168 | CONFIG_SLIP_MODE_SLIP6=y | 168 | CONFIG_SLIP_MODE_SLIP6=y |
169 | CONFIG_NETCONSOLE=y | 169 | CONFIG_NETCONSOLE=y |
170 | CONFIG_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 |
213 | CONFIG_NETCONSOLE=m | 213 | CONFIG_NETCONSOLE=m |
214 | CONFIG_NETPOLL_TRAP=y | ||
215 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 214 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
216 | CONFIG_INPUT_EVDEV=y | 215 | CONFIG_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 | |||
154 | CONFIG_BONDING=m | 154 | CONFIG_BONDING=m |
155 | CONFIG_DUMMY=m | 155 | CONFIG_DUMMY=m |
156 | CONFIG_NETCONSOLE=y | 156 | CONFIG_NETCONSOLE=y |
157 | CONFIG_NETPOLL_TRAP=y | ||
158 | CONFIG_TUN=m | 157 | CONFIG_TUN=m |
159 | CONFIG_VIRTIO_NET=m | 158 | CONFIG_VIRTIO_NET=m |
160 | CONFIG_VHOST_NET=m | 159 | CONFIG_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 | |||
103 | CONFIG_BONDING=m | 103 | CONFIG_BONDING=m |
104 | CONFIG_DUMMY=m | 104 | CONFIG_DUMMY=m |
105 | CONFIG_NETCONSOLE=y | 105 | CONFIG_NETCONSOLE=y |
106 | CONFIG_NETPOLL_TRAP=y | ||
107 | CONFIG_TUN=m | 106 | CONFIG_TUN=m |
108 | CONFIG_VORTEX=y | 107 | CONFIG_VORTEX=y |
109 | CONFIG_ACENIC=y | 108 | CONFIG_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 | |||
629 | CONFIG_NET_FC=y | 629 | CONFIG_NET_FC=y |
630 | CONFIG_NETCONSOLE=m | 630 | CONFIG_NETCONSOLE=m |
631 | CONFIG_NETCONSOLE_DYNAMIC=y | 631 | CONFIG_NETCONSOLE_DYNAMIC=y |
632 | CONFIG_NETPOLL_TRAP=y | ||
633 | CONFIG_VIRTIO_NET=m | 632 | CONFIG_VIRTIO_NET=m |
634 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 633 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
635 | CONFIG_INPUT_JOYDEV=m | 634 | CONFIG_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 | |||
133 | CONFIG_BONDING=m | 133 | CONFIG_BONDING=m |
134 | CONFIG_DUMMY=m | 134 | CONFIG_DUMMY=m |
135 | CONFIG_NETCONSOLE=y | 135 | CONFIG_NETCONSOLE=y |
136 | CONFIG_NETPOLL_TRAP=y | ||
137 | CONFIG_TUN=m | 136 | CONFIG_TUN=m |
138 | CONFIG_VIRTIO_NET=m | 137 | CONFIG_VIRTIO_NET=m |
139 | CONFIG_VHOST_NET=m | 138 | CONFIG_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 | |||
134 | CONFIG_BONDING=m | 134 | CONFIG_BONDING=m |
135 | CONFIG_DUMMY=m | 135 | CONFIG_DUMMY=m |
136 | CONFIG_NETCONSOLE=y | 136 | CONFIG_NETCONSOLE=y |
137 | CONFIG_NETPOLL_TRAP=y | ||
138 | CONFIG_TUN=m | 137 | CONFIG_TUN=m |
139 | CONFIG_VIRTIO_NET=m | 138 | CONFIG_VIRTIO_NET=m |
140 | CONFIG_VHOST_NET=m | 139 | CONFIG_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 | |||
218 | CONFIG_MACVTAP=m | 218 | CONFIG_MACVTAP=m |
219 | CONFIG_NETCONSOLE=m | 219 | CONFIG_NETCONSOLE=m |
220 | CONFIG_NETCONSOLE_DYNAMIC=y | 220 | CONFIG_NETCONSOLE_DYNAMIC=y |
221 | CONFIG_NETPOLL_TRAP=y | ||
222 | CONFIG_TUN=y | 221 | CONFIG_TUN=y |
223 | CONFIG_VETH=m | 222 | CONFIG_VETH=m |
224 | CONFIG_NET_DSA_MV88E6060=y | 223 | CONFIG_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 | |||
337 | CONFIG_MACVTAP=m | 337 | CONFIG_MACVTAP=m |
338 | CONFIG_NETCONSOLE=m | 338 | CONFIG_NETCONSOLE=m |
339 | CONFIG_NETCONSOLE_DYNAMIC=y | 339 | CONFIG_NETCONSOLE_DYNAMIC=y |
340 | CONFIG_NETPOLL_TRAP=y | ||
341 | CONFIG_TUN=y | 340 | CONFIG_TUN=y |
342 | CONFIG_VETH=m | 341 | CONFIG_VETH=m |
343 | CONFIG_NET_DSA_MV88E6060=y | 342 | CONFIG_NET_DSA_MV88E6060=y |