diff --git a/[refs] b/[refs] index d6927c97b7ae..832b5b8f865f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3db9aaaf87b77eb9669157c723f6cb7e234bcef0 +refs/heads/master: 0a5cab42a1317326d87b0d074df50705a0c3fa77 diff --git a/trunk/arch/powerpc/platforms/pseries/eeh.c b/trunk/arch/powerpc/platforms/pseries/eeh.c index a33ba833109c..3a857b22aa1e 100644 --- a/trunk/arch/powerpc/platforms/pseries/eeh.c +++ b/trunk/arch/powerpc/platforms/pseries/eeh.c @@ -478,7 +478,7 @@ static struct device_node * find_device_pe(struct device_node *dn) * an interrupt context, which is bad. */ -static inline void __eeh_mark_slot (struct device_node *dn) +static void __eeh_mark_slot (struct device_node *dn) { while (dn) { PCI_DN(dn)->eeh_mode |= EEH_MODE_ISOLATED; @@ -489,7 +489,7 @@ static inline void __eeh_mark_slot (struct device_node *dn) } } -static inline void __eeh_clear_slot (struct device_node *dn) +static void __eeh_clear_slot (struct device_node *dn) { while (dn) { PCI_DN(dn)->eeh_mode &= ~EEH_MODE_ISOLATED;