diff options
Diffstat (limited to 'include/asm-blackfin')
| -rw-r--r-- | include/asm-blackfin/blackfin-config-post.h | 6 | ||||
| -rw-r--r-- | include/asm-blackfin/io.h | 2 | ||||
| -rw-r--r-- | include/asm-blackfin/types.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-blackfin/blackfin-config-post.h b/include/asm-blackfin/blackfin-config-post.h index 442222513c..6a1ffa17d0 100644 --- a/include/asm-blackfin/blackfin-config-post.h +++ b/include/asm-blackfin/blackfin-config-post.h @@ -14,9 +14,9 @@ # error Memory Map does not fit into configuration #endif -/* Sanity check BFIN_CPU */ -#ifndef BFIN_CPU -# error BFIN_CPU: your board config needs to define this +/* Sanity check CONFIG_BFIN_CPU */ +#ifndef CONFIG_BFIN_CPU +# error CONFIG_BFIN_CPU: your board config needs to define this #endif /* Make sure the structure is properly aligned */ diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h index 2149685c17..da58914987 100644 --- a/include/asm-blackfin/io.h +++ b/include/asm-blackfin/io.h @@ -45,8 +45,6 @@ extern void cf_outb(unsigned char val, volatile unsigned char *addr); * that can be used to access the memory range with the caching * properties specified by "flags". */ -typedef unsigned long phys_addr_t; - #define MAP_NOCACHE (0) #define MAP_WRCOMBINE (0) #define MAP_WRBACK (0) diff --git a/include/asm-blackfin/types.h b/include/asm-blackfin/types.h index 9fd8e03360..2160ba0d02 100644 --- a/include/asm-blackfin/types.h +++ b/include/asm-blackfin/types.h @@ -78,6 +78,9 @@ typedef unsigned long long u64; typedef u32 dma_addr_t; +typedef unsigned long phys_addr_t; +typedef unsigned long phys_size_t; + #endif #endif |