Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio
[firefly-linux-kernel-4.4.55.git] / arch / tile / configs / tilepro_defconfig
index c7702b7ab7a55eec58e24a54a3e2146df17ea9fb..76a2781dec2c879bf1dde6d861bd22155094ca0b 100644 (file)
@@ -337,7 +337,6 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL_TRAP=y
 CONFIG_TUN=y
 CONFIG_VETH=m
 CONFIG_NET_DSA_MV88E6060=y