git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
cpm1.h
diff --git
a/arch/powerpc/include/asm/cpm1.h
b/arch/powerpc/include/asm/cpm1.h
index
2ff7987
..
7685ffd
100644
(file)
--- 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