diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 19:38:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 19:38:08 -0700 |
| commit | a5b617368c8d61072844ac267aaf140e489b808b (patch) | |
| tree | 2b7699b6bd7d044a0301962d679682f99a0718ab /arch/x86/include/asm/hpet.h | |
| parent | 03a7ab083e4d619136d6f07ce70fa9de0bc436fc (diff) | |
| parent | 54ff7e595d763d894104d421b103a89f7becf47c (diff) | |
| download | talos-obmc-linux-a5b617368c8d61072844ac267aaf140e489b808b.tar.gz talos-obmc-linux-a5b617368c8d61072844ac267aaf140e489b808b.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: hpet: Work around hardware stupidity
x86, build: Disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y
x86, cpufeature: Suppress compiler warning with gcc 3.x
x86, UV: Fix initialization of max_pnode
Diffstat (limited to 'arch/x86/include/asm/hpet.h')
| -rw-r--r-- | arch/x86/include/asm/hpet.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h index 004e6e25e913..1d5c08a1bdfd 100644 --- a/arch/x86/include/asm/hpet.h +++ b/arch/x86/include/asm/hpet.h @@ -68,7 +68,6 @@ extern unsigned long force_hpet_address; extern u8 hpet_blockid; extern int hpet_force_user; extern u8 hpet_msi_disable; -extern u8 hpet_readback_cmp; extern int is_hpet_enabled(void); extern int hpet_enable(void); extern void hpet_disable(void); |
