diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:56 -0800 |
| commit | cbd84ec0d5cf4ff760caa4b6de2925a21e21437d (patch) | |
| tree | b05681fd753bef3c3beb5c6aa3e83b9701d5f837 /include | |
| parent | 7b286af3921e13da4838cdb451639b959c187c82 (diff) | |
| parent | 280bb6b1f76aaec29a721b1025ec5d69afba57e8 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Make PS3_SYS_MANAGER default y, not m
[POWERPC] Fix rounding bug in emulation for double float operating
[POWERPC] iSeries: don't printk with HV spinlock held
[POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC
[POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset().
[POWERPC] Kill non-existent symbols from ksyms and commproc.h
[POWERPC] Fix typo #ifdef -> #ifndef
Diffstat (limited to 'include')
| -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 a2328b8addd..2ee59d7b335 100644 --- a/include/asm-powerpc/commproc.h +++ b/include/asm-powerpc/commproc.h @@ -698,9 +698,6 @@ typedef struct risc_timer_pram { #define CICR_IEN ((uint)0x00000080) /* Int. enable */ #define CICR_SPS ((uint)0x00000001) /* SCC Spread */ -extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); -extern void cpm_free_handler(int vec); - #define IMAP_ADDR (get_immrbase()) #define CPM_PIN_INPUT 0 |