summaryrefslogtreecommitdiff
path: root/drivers/pnp/isapnp/proc.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-07-26 21:41:19 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-26 22:35:20 +0400
commit8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480 (patch)
treecf62a4a8c5197d0d205b093dd1f764114bae1aeb /drivers/pnp/isapnp/proc.c
parent4fc09385c79fa95e97365d33de9b4e046d680b94 (diff)
downloadlinux-8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480.tar.xz
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 'drivers/pnp/isapnp/proc.c')
0 files changed, 0 insertions, 0 deletions