diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-29 09:04:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-29 09:04:58 -0700 |
| commit | 99202312a6e44bbe29355c5706064fb71dd33db9 (patch) | |
| tree | dfada1bc6d9348e9bbd1dd07a0a7301500c5a717 /net | |
| parent | 53699287a25ea8c6d3a3f1b3404d8ebbcba6b580 (diff) | |
| parent | 17f083137dccfdf1699d80b4ecf161761a7d94b3 (diff) | |
| download | history-99202312a6e44bbe29355c5706064fb71dd33db9.tar.gz | |
Merge bk://cifs.bkbits.net/linux-2.5cifs
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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 |