From c39ed6350b2a2231c692320ea08d078ee56c741f Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Wed, 23 Jan 2008 12:42:07 -0600 Subject: [PATCH] --- yaml --- r: 81315 b: refs/heads/master c: 1d59483aecb5bc80bdd677a46e77515a733c1a6f h: refs/heads/master i: 81313: 1f69449038a4db07b276151b4db29bf66d1b855f 81311: c99cde52aabdb25922d1e38c8040f97c501365e6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 2 -- trunk/include/asm-powerpc/system.h | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 55eb4a47b345..aa35c25742e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70f782e14870435aa37b91e1ea0a189a78eb0fa9 +refs/heads/master: 1d59483aecb5bc80bdd677a46e77515a733c1a6f diff --git a/trunk/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/trunk/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c index a2c04b9d42b1..d4f8bf581e3a 100644 --- a/trunk/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +++ b/trunk/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/trunk/include/asm-powerpc/system.h b/trunk/include/asm-powerpc/system.h index 87be8c3bc9cb..bc9739dff5e7 100644 --- a/trunk/include/asm-powerpc/system.h +++ b/trunk/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;