diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
| commit | c99da91e7a12724127475a85cc7a38214b3504e2 (patch) | |
| tree | de0eb3fe32ce58804457963fd133a53bb8fba5b8 /include/asm-blackfin/page_offset.h | |
| parent | a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff) | |
| parent | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff) | |
| download | linux-c99da91e7a12724127475a85cc7a38214b3504e2.tar.gz linux-c99da91e7a12724127475a85cc7a38214b3504e2.tar.bz2 linux-c99da91e7a12724127475a85cc7a38214b3504e2.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-blackfin/page_offset.h')
| -rw-r--r-- | include/asm-blackfin/page_offset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-blackfin/page_offset.h b/include/asm-blackfin/page_offset.h index 3b671d5fd70d..cbaff24b4b25 100644 --- a/include/asm-blackfin/page_offset.h +++ b/include/asm-blackfin/page_offset.h @@ -1,6 +1,6 @@ /* This handles the memory map.. */ -#ifdef CONFIG_BFIN +#ifdef CONFIG_BLACKFIN #define PAGE_OFFSET_RAW 0x00000000 #endif |