diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/ia64/kernel/efi.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index b13c0555c3ba..e4bfa9dafbce 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -759,7 +759,7 @@ valid_phys_addr_range (unsigned long phys_addr, unsigned long size) | |||
| 759 | } | 759 | } |
| 760 | 760 | ||
| 761 | int | 761 | int |
| 762 | valid_mmap_phys_addr_range (unsigned long phys_addr, unsigned long size) | 762 | valid_mmap_phys_addr_range (unsigned long pfn, unsigned long size) |
| 763 | { | 763 | { |
| 764 | /* | 764 | /* |
| 765 | * MMIO regions are often missing from the EFI memory map. | 765 | * MMIO regions are often missing from the EFI memory map. |