diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-04 00:36:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-04 00:36:46 -0400 |
| commit | 0e76a3a587fc7abda2badf249053b427baad255e (patch) | |
| tree | 646a1da67dc25654552028225ca4b7a0a8043cc9 /net/Kconfig | |
| parent | fba3679d34511c42bf452e89dda457a1219eb43a (diff) | |
| parent | 72a67a94bcba71a5fddd6b3596a20604d2b5dcd6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next to setup some infrastructure Eric
Dumazet needs for usbnet changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Kconfig b/net/Kconfig index 37162eb88f07..ee0213667272 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -244,7 +244,7 @@ config NETPRIO_CGROUP | |||
| 244 | Cgroup subsystem for use in assigning processes to network priorities on | 244 | Cgroup subsystem for use in assigning processes to network priorities on |
| 245 | a per-interface basis | 245 | a per-interface basis |
| 246 | 246 | ||
| 247 | config NET_LL_RX_POLL | 247 | config NET_RX_BUSY_POLL |
| 248 | boolean | 248 | boolean |
| 249 | default y | 249 | default y |
| 250 | 250 | ||