diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /include/asm-blackfin/page_offset.h | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'include/asm-blackfin/page_offset.h')
| -rw-r--r-- | include/asm-blackfin/page_offset.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-blackfin/page_offset.h b/include/asm-blackfin/page_offset.h deleted file mode 100644 index cbaff24b4b25..000000000000 --- a/include/asm-blackfin/page_offset.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | |||
| 2 | /* This handles the memory map.. */ | ||
| 3 | |||
| 4 | #ifdef CONFIG_BLACKFIN | ||
| 5 | #define PAGE_OFFSET_RAW 0x00000000 | ||
| 6 | #endif | ||