diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/blackfin/include/asm/page_offset.h | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/blackfin/include/asm/page_offset.h')
| -rw-r--r-- | arch/blackfin/include/asm/page_offset.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/page_offset.h b/arch/blackfin/include/asm/page_offset.h index cbaff24b4b25..d06a89b89d20 100644 --- a/arch/blackfin/include/asm/page_offset.h +++ b/arch/blackfin/include/asm/page_offset.h | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 1 | /* | |
| 2 | /* This handles the memory map.. */ | 2 | * This handles the memory map |
| 3 | * | ||
| 4 | * Copyright 2004-2008 Analog Devices Inc. | ||
| 5 | * | ||
| 6 | * Licensed under the GPL-2 or later. | ||
| 7 | */ | ||
| 3 | 8 | ||
| 4 | #ifdef CONFIG_BLACKFIN | 9 | #ifdef CONFIG_BLACKFIN |
| 5 | #define PAGE_OFFSET_RAW 0x00000000 | 10 | #define PAGE_OFFSET_RAW 0x00000000 |