diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
| commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
| tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /arch/ppc64 | |
| parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/kernel/setup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index d1b33f0b26cb..e80f10c89824 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c | |||
| @@ -694,7 +694,6 @@ void machine_restart(char *cmd) | |||
| 694 | local_irq_disable(); | 694 | local_irq_disable(); |
| 695 | while (1) ; | 695 | while (1) ; |
| 696 | } | 696 | } |
| 697 | EXPORT_SYMBOL(machine_restart); | ||
| 698 | 697 | ||
| 699 | void machine_power_off(void) | 698 | void machine_power_off(void) |
| 700 | { | 699 | { |
| @@ -707,7 +706,6 @@ void machine_power_off(void) | |||
| 707 | local_irq_disable(); | 706 | local_irq_disable(); |
| 708 | while (1) ; | 707 | while (1) ; |
| 709 | } | 708 | } |
| 710 | EXPORT_SYMBOL(machine_power_off); | ||
| 711 | 709 | ||
| 712 | void machine_halt(void) | 710 | void machine_halt(void) |
| 713 | { | 711 | { |
| @@ -720,7 +718,6 @@ void machine_halt(void) | |||
| 720 | local_irq_disable(); | 718 | local_irq_disable(); |
| 721 | while (1) ; | 719 | while (1) ; |
| 722 | } | 720 | } |
| 723 | EXPORT_SYMBOL(machine_halt); | ||
| 724 | 721 | ||
| 725 | static int ppc64_panic_event(struct notifier_block *this, | 722 | static int ppc64_panic_event(struct notifier_block *this, |
| 726 | unsigned long event, void *ptr) | 723 | unsigned long event, void *ptr) |