aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-26 16:58:01 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-26 16:58:01 +1000
commitfd0cca754f3f6756bfdafe500e4f49b1b9e9723f (patch)
treeb1eb43fb2fb068ed5fc92b031e3ae853e599af9c /arch/powerpc/include
parent5ba762c9bb3ce2cc11e9e111cb3c476e84b91668 (diff)
parent66c6b856d8738278a4a6e558d25c90e9950aa112 (diff)
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/cpm1.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/cpm1.h b/arch/powerpc/include/asm/cpm1.h
index 2ff798744c1..7685ffde882 100644
--- a/arch/powerpc/include/asm/cpm1.h
+++ b/arch/powerpc/include/asm/cpm1.h
@@ -598,8 +598,6 @@ typedef struct risc_timer_pram {
#define CICR_IEN ((uint)0x00000080) /* Int. enable */
#define CICR_SPS ((uint)0x00000001) /* SCC Spread */
-#define IMAP_ADDR (get_immrbase())
-
#define CPM_PIN_INPUT 0
#define CPM_PIN_OUTPUT 1
#define CPM_PIN_PRIMARY 0