diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-21 02:16:36 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-21 02:16:36 -0500 |
commit | a077e91690fb32a1453423b2cf1df3492fd30c3a (patch) | |
tree | 13fa5ed7c365f8f3f0c075ac308ee02a67782dfe | |
parent | 2dc2f8e0c46864e2a3722c84eaa96513d4cf8b2f (diff) |
sh: Conserve fixmap slots when IOREMAP_FIXED=n.
Presently the IOREMAP_FIXED fixmaps are always defined, even if the
platform isn't capable of supporting it. Since we already have an ifdef
for it, ifdef the entries, too.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/include/asm/fixmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/fixmap.h b/arch/sh/include/asm/fixmap.h index 17b22b6c100..6e7cea45389 100644 --- a/arch/sh/include/asm/fixmap.h +++ b/arch/sh/include/asm/fixmap.h | |||
@@ -61,6 +61,7 @@ enum fixed_addresses { | |||
61 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, | 61 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | #ifdef CONFIG_IOREMAP_FIXED | ||
64 | /* | 65 | /* |
65 | * FIX_IOREMAP entries are useful for mapping physical address | 66 | * FIX_IOREMAP entries are useful for mapping physical address |
66 | * space before ioremap() is useable, e.g. really early in boot | 67 | * space before ioremap() is useable, e.g. really early in boot |
@@ -69,6 +70,7 @@ enum fixed_addresses { | |||
69 | #define FIX_N_IOREMAPS 32 | 70 | #define FIX_N_IOREMAPS 32 |
70 | FIX_IOREMAP_BEGIN, | 71 | FIX_IOREMAP_BEGIN, |
71 | FIX_IOREMAP_END = FIX_IOREMAP_BEGIN + FIX_N_IOREMAPS, | 72 | FIX_IOREMAP_END = FIX_IOREMAP_BEGIN + FIX_N_IOREMAPS, |
73 | #endif | ||
72 | 74 | ||
73 | __end_of_fixed_addresses | 75 | __end_of_fixed_addresses |
74 | }; | 76 | }; |