diff options
| author | Jon Loeliger <jdl@jdl.com> | 2008-01-23 12:42:07 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-23 19:54:30 -0600 |
| commit | 1d59483aecb5bc80bdd677a46e77515a733c1a6f (patch) | |
| tree | f0af49cc7b00923129608ee87804ac5280b87e4f | |
| parent | 70f782e14870435aa37b91e1ea0a189a78eb0fa9 (diff) | |
| download | op-kernel-dev-1d59483aecb5bc80bdd677a46e77515a733c1a6f.zip op-kernel-dev-1d59483aecb5bc80bdd677a46e77515a733c1a6f.tar.gz | |
[POWERPC] Add _nmask_and_or_msr() declartion to asm-powerpc/system.h
Prevents miscellaneous users from declaring it locally.
Signed-off-by: Jon Loeliger <jdl@freecale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/system.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c index a2c04b9..d4f8bf5 100644 --- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c @@ -53,8 +53,6 @@ #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000 -extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); - int mpc7448_hpc2_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index 87be8c3..bc9739d 100644 --- a/include/asm-powerpc/system.h +++ b/include/asm-powerpc/system.h @@ -169,6 +169,8 @@ extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long); extern void bad_page_fault(struct pt_regs *, unsigned long, int); extern int die(const char *, struct pt_regs *, long); extern void _exception(int, struct pt_regs *, int, unsigned long); +extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); + #ifdef CONFIG_BOOKE_WDT extern u32 booke_wdt_enabled; extern u32 booke_wdt_period; |
