From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Tue, 23 Sep 2008 18:01:45 +0000 (-0700)
Subject: x86: pvclock: fix shadowed variable warning
X-Git-Tag: v2.6.28-rc1~269^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a08546001c2b0f584ffc81987340943a7d6d6acb;p=pandora-kernel.git

x86: pvclock: fix shadowed variable warning

arch/x86/kernel/pvclock.c:102:6: warning: symbol 'tsc_khz' shadows an earlier one
include/asm/tsc.h:18:21: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

Reading git-diff-tree failed