diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-26 10:41:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 11:35:20 -0700 |
commit | 8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480 (patch) | |
tree | cf62a4a8c5197d0d205b093dd1f764114bae1aeb /include/linux/pnp.h | |
parent | m32r: Fix ei_tx_timeout() in drivers/net/lib8390.c (diff) | |
download | linux-dev-8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480.tar.xz linux-dev-8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480.zip |
x86_64: cleanup tsc.c merge artifact
tsc_unstable is declared twice.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/pnp.h')
0 files changed, 0 insertions, 0 deletions