diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /net/sched/Kconfig | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'net/sched/Kconfig')
| -rw-r--r-- | net/sched/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 8a260d43ceef..778b1e5a4b50 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
| @@ -44,7 +44,7 @@ if NET_SCHED | |||
| 44 | 44 | ||
| 45 | choice | 45 | choice |
| 46 | prompt "Packet scheduler clock source" | 46 | prompt "Packet scheduler clock source" |
| 47 | default NET_SCH_CLK_JIFFIES | 47 | default NET_SCH_CLK_GETTIMEOFDAY |
| 48 | ---help--- | 48 | ---help--- |
| 49 | Packet schedulers need a monotonic clock that increments at a static | 49 | Packet schedulers need a monotonic clock that increments at a static |
| 50 | rate. The kernel provides several suitable interfaces, each with | 50 | rate. The kernel provides several suitable interfaces, each with |