diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 13:50:08 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 13:50:08 -0400 |
commit | 6de7dc2c4c713d037c19aa1e310d240f16973414 (patch) | |
tree | 68963db8081e6ef18affd06cf2e9b00578ef874e /arch/m68knommu | |
parent | cbc3d65ebcb0c494183d45cf202a53352cbf3871 (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/kernel/process.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c index c4a33f265dc0..82e7ec888806 100644 --- a/arch/m68knommu/kernel/process.c +++ b/arch/m68knommu/kernel/process.c | |||
@@ -80,8 +80,6 @@ void machine_restart(char * __unused) | |||
80 | for (;;); | 80 | for (;;); |
81 | } | 81 | } |
82 | 82 | ||
83 | EXPORT_SYMBOL(machine_restart); | ||
84 | |||
85 | void machine_halt(void) | 83 | void machine_halt(void) |
86 | { | 84 | { |
87 | if (mach_halt) | 85 | if (mach_halt) |
@@ -89,8 +87,6 @@ void machine_halt(void) | |||
89 | for (;;); | 87 | for (;;); |
90 | } | 88 | } |
91 | 89 | ||
92 | EXPORT_SYMBOL(machine_halt); | ||
93 | |||
94 | void machine_power_off(void) | 90 | void machine_power_off(void) |
95 | { | 91 | { |
96 | if (mach_power_off) | 92 | if (mach_power_off) |
@@ -98,8 +94,6 @@ void machine_power_off(void) | |||
98 | for (;;); | 94 | for (;;); |
99 | } | 95 | } |
100 | 96 | ||
101 | EXPORT_SYMBOL(machine_power_off); | ||
102 | |||
103 | void show_regs(struct pt_regs * regs) | 97 | void show_regs(struct pt_regs * regs) |
104 | { | 98 | { |
105 | printk(KERN_NOTICE "\n"); | 99 | printk(KERN_NOTICE "\n"); |