diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig
index 8d1cce2fdb12feb158abe1fa5862621896303650..5b5c70ed32cb072abeb6100e603fe237fd0c6035 100644
--- a/configs/c5471evm/defconfig
+++ b/configs/c5471evm/defconfig
@@ -190,6 +190,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/c5471evm/dhcpconfig b/configs/c5471evm/dhcpconfig
index 9f848a8cf8713b5696f6e17f6743210978ae5c9c..7a44e126c90b5866022626ed6aa6504c500dba70 100644
--- a/configs/c5471evm/dhcpconfig
+++ b/configs/c5471evm/dhcpconfig
@@ -190,6 +190,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/c5471evm/netconfig b/configs/c5471evm/netconfig
index 6491e16fa2c61f18be1f6fead3b9ed40b68cfcf6..135f87ec9419909baceffd8975710753ad9deca6 100644
--- a/configs/c5471evm/netconfig
+++ b/configs/c5471evm/netconfig
@@ -190,6 +190,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/c5471evm/nshconfig b/configs/c5471evm/nshconfig
index 55c896c45db60c5ff5d75c95e6c0fc5b92ca4f1c..39a3b11219e9455b76f4c6efd13c48aa6b9a732d 100644
--- a/configs/c5471evm/nshconfig
+++ b/configs/c5471evm/nshconfig
@@ -190,6 +190,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 1580cd5349c8a450b5c38a3674a36c932d8c2983..117495ba3023ae05bf061bda755a570389e4a2bf 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -190,6 +190,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index 8f88cfe569cee48daa064698bae11698f2d5d4a8..12af3888ad032367fd35f59b22cb1c855ba667f9 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -174,6 +174,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 7c2a09578a2c6b321ad4e18bd59d380e940f52d7..9f6d9edd75538bba2d5dca941c0d18356f9984a2 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -203,6 +203,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig
index af8d0d84b6c816db486e5ffede3e2ca2a3fe39ff..be623258cf527990ba64e52264c181dfaf2a7d6a 100644
--- a/configs/mcu123-lpc214x/ostest/defconfig
+++ b/configs/mcu123-lpc214x/ostest/defconfig
@@ -203,6 +203,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index c817da59b7cff99307facab973881144380cb198..63cabf7c423d5cab9f47f042dad69a947e269fa6 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -204,6 +204,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/mcu123-lpc214x/usbstorage/defconfig b/configs/mcu123-lpc214x/usbstorage/defconfig
index c95bb2dff9e48fdd3872bc11f34fc2e28f903322..aeaa2e9144ad9bbdc813dd0746e43d99fff44b1a 100644
--- a/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -204,6 +204,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index 5a4a760ccd397d49f9cf786ffd6ada685d73ca79..f25b9ac8bdee1ea1e3d2b7482476091eec7a526c 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -188,6 +188,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 40489d75c5505476b03dfcd5830b11dacd26e3f2..e1b318dd40eb497e98a4603e5f8f18e1c99cd133 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -188,6 +188,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig
index 7a262f725edbc5811e444f3879660c4251fc3e79..c4f70d85f79692111f56892f363ee4140f8c37ee 100644
--- a/configs/ntosd-dm320/ostest/defconfig
+++ b/configs/ntosd-dm320/ostest/defconfig
@@ -188,6 +188,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 75e320c68d0087ec65971db169ca6ee33786fd70..f2562d2eebad2228d73f05e0ecb48e2b4250e377 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -188,6 +188,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index 3b74efc44a6023559b41fc75f0239270bf401f6e..3219b4e86e09f89e5c09beb04ed683abde142192 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -188,6 +188,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/olimex-strp711/ostest/defconfig b/configs/olimex-strp711/ostest/defconfig
index 04b3606d72f2932c8b2d7d2451e502f5925c8d0d..1632dbb08b6bbd31b3d93fd05a60c72fd11c2752 100644
--- a/configs/olimex-strp711/ostest/defconfig
+++ b/configs/olimex-strp711/ostest/defconfig
@@ -270,6 +270,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index eeeb10a9b3eb534f208b93bf7764fdbc70c6acb0..934e255a86423fc363d9c06ad1bcd008f2bbf38f 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -171,6 +171,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 0135641a950e4e8683e8162da3e195ea865ba902..2c39b55a95a774bced10e8dcbd1f016a3b62d078 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -120,6 +120,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 9cdd3c9defebd7583a546bd664801248c0f46975..f211b86cc88526a9cff776650dcb9ddb089d520c 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -120,6 +120,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 9ea33d86c7e46ad0989ce7dd4626e8e36808f87b..3ea4b4e44e3397ed1f5c00b1d5fedaf9f3c08988 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -120,6 +120,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index a2f049f45cd9eeff6f3124369c4ce40594597d71..4c1249466f8bd78892ff99731d0efe7701a4baba 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -121,6 +121,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 3adc82c57b754a5ca4b57ff2373a876587f89226..164c4ac6b7306a1663c6c79779e60340008cb117 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -120,6 +120,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index f2bb020570c1330e015ea9e204c8282e88ed5dc4..e4e150b09ae67b1df7edfe2eec915b0b8992980e 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -222,6 +222,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index b599a8bed92d75b85feaca0a68f4b6f3dc52d3ef..e21df0942c5ea826c63f6e4a7b71d0370aee1326 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -222,6 +222,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 316413f4da8431995e1a428e15bebf8d1a9eeb21..d26ff9d06e84986789f46edd75c8d45a4517faf8 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -167,6 +167,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index 5a5a2d1e7a0ad00eed9f0c85e0e332c9d70ccf13..b17d18c23a0634c0e91186e66d7a8e0d5a260de0 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -167,6 +167,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index d76598566f25661364ab279ed9f340cca328ec11..7e7e7f986955a194282956bcd2baed24a65e0013 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -167,6 +167,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 00ca3f404d95d64d38429df6d019cfaffefce4cc..6b3959ec44401391b6fd2c6e0cbd87ad2a55c667 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -193,6 +193,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index c887ff4070198a54b904c6cbdbaef21e6924783f..d1ac37bd33c8be3dbd33579f0d663a0aaabe974a 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -193,6 +193,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=n
 CONFIG_DISABLE_MOUNTPOINT=n
 CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 160fa8dc466edfd380370555c8622674b00ebbfb..0589cdc061942a9fa7a7e9c18c2eb7de14b35c4d 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -157,6 +157,7 @@ CONFIG_DISABLE_SIGNALS=n
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index 05c3a27f582bf8469143beaa6c3128b4616554f8..ecf71cb6dc8ab66798cc8d31151a33755560c2c0 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -157,6 +157,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 54fcf0d9925e6f0564721c20afeaca46ef65474c..4e2e6a6a079d78cad23acd882b6f753d62af4679 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -157,6 +157,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index a1a644782895e2156e66ab6af518587370134bed..4f8a8c4e2a52fa67c3470eda5b5baa1ac761cf47 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -191,6 +191,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 2b9e57ffd24468c3898751904297707a0e985e20..444ff59d0ad5a787d261b7448fd5c7f21dc3363d 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -191,6 +191,7 @@ CONFIG_DISABLE_SIGNALS=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_ENVIRON=y
+CONFIG_DISABLE_POLL=y
 
 #
 # Misc libc settings