projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
arch
/
sh
/
drivers
/
pci
/
pci.c
diff --git
a/arch/sh/drivers/pci/pci.c
b/arch/sh/drivers/pci/pci.c
index
d5462b7
..
84563e3
100644
(file)
--- a/
arch/sh/drivers/pci/pci.c
+++ b/
arch/sh/drivers/pci/pci.c
@@
-221,7
+221,7
@@
pcibios_bus_report_status_early(struct pci_channel *hose,
* We can't use pci_find_device() here since we are
* called from interrupt context.
*/
* We can't use pci_find_device() here since we are
* called from interrupt context.
*/
-static void __
init_refok
+static void __
ref
pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
int warn)
{
pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
int warn)
{
@@
-256,7
+256,7
@@
pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
pcibios_bus_report_status(dev->subordinate, status_mask, warn);
}
pcibios_bus_report_status(dev->subordinate, status_mask, warn);
}
-void __
init_refok
pcibios_report_status(unsigned int status_mask, int warn)
+void __
ref
pcibios_report_status(unsigned int status_mask, int warn)
{
struct pci_channel *hose;
{
struct pci_channel *hose;