diff --git a/[refs] b/[refs] index 369344fd3d95..9e2a803b4af4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 008d55903a1e9e179ff1d366dfcfa9b72abd116d +refs/heads/master: 9eb343aeb3e106c1e4c07e2863f45b2c121b3b78 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 5148d47492a0..8fa0e26fa805 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -2201,8 +2201,8 @@ config S2IO depends on PCI ---help--- This driver supports the 10Gbe XFrame NIC of S2IO. - For help regarding driver compilation, installation and - tuning please look into ~/drivers/net/s2io/README.txt. + More specific information on configuring the driver is in + . config S2IO_NAPI bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"