diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /include/asm-powerpc | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/commproc.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-powerpc/commproc.h b/include/asm-powerpc/commproc.h index 0e192cc3ead2..9e3b8648648c 100644 --- a/include/asm-powerpc/commproc.h +++ b/include/asm-powerpc/commproc.h | |||
| @@ -698,9 +698,6 @@ typedef struct risc_timer_pram { | |||
| 698 | #define CICR_IEN ((uint)0x00000080) /* Int. enable */ | 698 | #define CICR_IEN ((uint)0x00000080) /* Int. enable */ |
| 699 | #define CICR_SPS ((uint)0x00000001) /* SCC Spread */ | 699 | #define CICR_SPS ((uint)0x00000001) /* SCC Spread */ |
| 700 | 700 | ||
| 701 | extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); | ||
| 702 | extern void cpm_free_handler(int vec); | ||
| 703 | |||
| 704 | #define IMAP_ADDR (get_immrbase()) | 701 | #define IMAP_ADDR (get_immrbase()) |
| 705 | 702 | ||
| 706 | #define CPM_PIN_INPUT 0 | 703 | #define CPM_PIN_INPUT 0 |