diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-09 19:44:53 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-09 19:44:53 -0400 |
| commit | a84f5770170232a48e753e02ee5f0f17ee17b791 (patch) | |
| tree | 4efbd8a990df4437fb178c8a705dadc36812f98a /arch/i386 | |
| parent | 66302f211a21bb9439a2ae7f7b6a4c386bb10ecd (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
Merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 53eb5cfd5b..848bb97af7 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
| @@ -650,7 +650,7 @@ acpi_find_rsdp (void) | |||
| 650 | */ | 650 | */ |
| 651 | rsdp_phys = acpi_scan_rsdp (0, 0x400); | 651 | rsdp_phys = acpi_scan_rsdp (0, 0x400); |
| 652 | if (!rsdp_phys) | 652 | if (!rsdp_phys) |
| 653 | rsdp_phys = acpi_scan_rsdp (0xE0000, 0xFFFFF); | 653 | rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000); |
| 654 | 654 | ||
| 655 | return rsdp_phys; | 655 | return rsdp_phys; |
| 656 | } | 656 | } |