diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
| commit | 1fb5fef9b80d9a3b5368e22031627afd1585487b (patch) | |
| tree | 54f07a532b5b2622b8642156bbcaeca637fcdb8f /arch/powerpc/kernel/setup_64.c | |
| parent | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (diff) | |
| parent | 330ab71619bacc4d4494227a6cfc9b7f5500403d (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 13e91c4d70a8..4467c49903b6 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -594,14 +594,6 @@ void ppc64_terminate_msg(unsigned int src, const char *msg) | |||
| 594 | printk("[terminate]%04x %s\n", src, msg); | 594 | printk("[terminate]%04x %s\n", src, msg); |
| 595 | } | 595 | } |
| 596 | 596 | ||
| 597 | int check_legacy_ioport(unsigned long base_port) | ||
| 598 | { | ||
| 599 | if (ppc_md.check_legacy_ioport == NULL) | ||
| 600 | return 0; | ||
| 601 | return ppc_md.check_legacy_ioport(base_port); | ||
| 602 | } | ||
| 603 | EXPORT_SYMBOL(check_legacy_ioport); | ||
| 604 | |||
| 605 | void cpu_die(void) | 597 | void cpu_die(void) |
| 606 | { | 598 | { |
| 607 | if (ppc_md.cpu_die) | 599 | if (ppc_md.cpu_die) |