diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-12 09:44:33 -0400 |
| commit | 0d62950125241a6e6db8e8f14271f098ec7a2da4 (patch) | |
| tree | 8cdd9e17f6a6ff4cb6166ad12a4d3ed1d45b2dc9 /arch/ia64/kernel/efi.c | |
| parent | b3bc2c5562f06ca34b30f61c5714e96490946c81 (diff) | |
| parent | 5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index d45f215bc8fc..51b75cea7018 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
| @@ -1232,9 +1232,10 @@ efi_initialize_iomem_resources(struct resource *code_resource, | |||
| 1232 | if (md->attribute & EFI_MEMORY_WP) { | 1232 | if (md->attribute & EFI_MEMORY_WP) { |
| 1233 | name = "System ROM"; | 1233 | name = "System ROM"; |
| 1234 | flags |= IORESOURCE_READONLY; | 1234 | flags |= IORESOURCE_READONLY; |
| 1235 | } else { | 1235 | } else if (md->attribute == EFI_MEMORY_UC) |
| 1236 | name = "Uncached RAM"; | ||
| 1237 | else | ||
| 1236 | name = "System RAM"; | 1238 | name = "System RAM"; |
| 1237 | } | ||
| 1238 | break; | 1239 | break; |
| 1239 | 1240 | ||
| 1240 | case EFI_ACPI_MEMORY_NVS: | 1241 | case EFI_ACPI_MEMORY_NVS: |