diff options
Diffstat (limited to 'arch/sparc64/kernel/pci_schizo.c')
-rw-r--r-- | arch/sparc64/kernel/pci_schizo.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c index e752e75cce83..e30609362322 100644 --- a/arch/sparc64/kernel/pci_schizo.c +++ b/arch/sparc64/kernel/pci_schizo.c | |||
@@ -1084,7 +1084,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm) | |||
1084 | pci_config_write8(addr, 64); | 1084 | pci_config_write8(addr, 64); |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | static void schizo_scan_bus(struct pci_pbm_info *pbm) | 1087 | static void __init schizo_scan_bus(struct pci_pbm_info *pbm) |
1088 | { | 1088 | { |
1089 | pbm_config_busmastering(pbm); | 1089 | pbm_config_busmastering(pbm); |
1090 | pbm->is_66mhz_capable = | 1090 | pbm->is_66mhz_capable = |
@@ -1333,9 +1333,9 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm) | |||
1333 | } | 1333 | } |
1334 | } | 1334 | } |
1335 | 1335 | ||
1336 | static int schizo_pbm_init(struct pci_controller_info *p, | 1336 | static int __init schizo_pbm_init(struct pci_controller_info *p, |
1337 | struct device_node *dp, u32 portid, | 1337 | struct device_node *dp, u32 portid, |
1338 | int chip_type) | 1338 | int chip_type) |
1339 | { | 1339 | { |
1340 | const struct linux_prom64_registers *regs; | 1340 | const struct linux_prom64_registers *regs; |
1341 | struct pci_pbm_info *pbm; | 1341 | struct pci_pbm_info *pbm; |
@@ -1430,7 +1430,8 @@ static inline int portid_compare(u32 x, u32 y, int chip_type) | |||
1430 | return (x == y); | 1430 | return (x == y); |
1431 | } | 1431 | } |
1432 | 1432 | ||
1433 | static void __schizo_init(struct device_node *dp, char *model_name, int chip_type) | 1433 | static void __init __schizo_init(struct device_node *dp, char *model_name, |
1434 | int chip_type) | ||
1434 | { | 1435 | { |
1435 | struct pci_controller_info *p; | 1436 | struct pci_controller_info *p; |
1436 | struct pci_pbm_info *pbm; | 1437 | struct pci_pbm_info *pbm; |
@@ -1474,17 +1475,17 @@ fatal_memory_error: | |||
1474 | prom_halt(); | 1475 | prom_halt(); |
1475 | } | 1476 | } |
1476 | 1477 | ||
1477 | void schizo_init(struct device_node *dp, char *model_name) | 1478 | void __init schizo_init(struct device_node *dp, char *model_name) |
1478 | { | 1479 | { |
1479 | __schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO); | 1480 | __schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO); |
1480 | } | 1481 | } |
1481 | 1482 | ||
1482 | void schizo_plus_init(struct device_node *dp, char *model_name) | 1483 | void __init schizo_plus_init(struct device_node *dp, char *model_name) |
1483 | { | 1484 | { |
1484 | __schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS); | 1485 | __schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS); |
1485 | } | 1486 | } |
1486 | 1487 | ||
1487 | void tomatillo_init(struct device_node *dp, char *model_name) | 1488 | void __init tomatillo_init(struct device_node *dp, char *model_name) |
1488 | { | 1489 | { |
1489 | __schizo_init(dp, model_name, PBM_CHIP_TYPE_TOMATILLO); | 1490 | __schizo_init(dp, model_name, PBM_CHIP_TYPE_TOMATILLO); |
1490 | } | 1491 | } |