diff options
| author | Avi Kivity <avi@qumranet.com> | 2008-02-21 14:12:05 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-02-21 14:12:05 +0200 |
| commit | d664df6bbf0b6212824340bc70a9b888461dcd36 (patch) | |
| tree | 342ce2833ba92a365144b5fa22cf922424502c98 /arch/x86/kernel/setup_32.c | |
| parent | 131c7cbe6154ce34f5db796ce3d1494f6c648300 (diff) | |
| parent | e80af3a8dbbbf431b2070cc760699f01c5a6ac69 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 988da57e9f11..1362cb27b557 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -165,7 +165,6 @@ unsigned long mmu_cr4_features = X86_CR4_PAE; unsigned int machine_id; unsigned int machine_submodel_id; unsigned int BIOS_revision; -unsigned int mca_pentium_flag; /* Boot loader ID as an integer, for the benefit of proc_dointvec */ int bootloader_type; |