diff options
author | Steve French <cifs.adm@hostme.bitkeeper.com> | 2004-07-26 21:16:37 -0700 |
---|---|---|
committer | Steve French <cifs.adm@hostme.bitkeeper.com> | 2004-07-26 21:16:37 -0700 |
commit | 486326cf4179a2ab63491503927047c6d053ece5 (patch) | |
tree | bf3d31841265217d138556c263b23babc8516a51 /net | |
parent | bb262c630e4ff77518d8f79a59095c6c84434209 (diff) | |
parent | 5b64aaf91c597ab43817a5f347179cb69cc0a211 (diff) | |
download | history-486326cf4179a2ab63491503927047c6d053ece5.tar.gz |
Merge bk://linux.bkbits.net/linux-2.5
into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs
Diffstat (limited to 'net')
-rw-r--r-- | net/sched/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 57b2cc4761e38f..08b8ebddefd34d 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -37,7 +37,7 @@ config NET_SCH_CLK_GETTIMEOFDAY config NET_SCH_CLK_CPU bool "CPU cycle counter" - depends on X86_TSC || X86_64 || ALPHA || SPARC64 || PPC64 || IA64 + depends on X86_TSC || X86_64 || SPARC64 || PPC64 || IA64 help Say Y here if you want to use the CPU's cycle counter as clock source. This is a cheap and high resolution clock source, but on some @@ -47,7 +47,6 @@ config NET_SCH_CLK_CPU The useable cycle counters are: x86/x86_64 - Timestamp Counter - alpha - Cycle Counter sparc64 - %ticks register ppc64 - Time base ia64 - Interval Time Counter |