diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /arch/x86_64/kernel/reboot.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/x86_64/kernel/reboot.c')
| -rw-r--r-- | arch/x86_64/kernel/reboot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c index 57117b8beb2b..2d6769847456 100644 --- a/arch/x86_64/kernel/reboot.c +++ b/arch/x86_64/kernel/reboot.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * Power off function, if any | 20 | * Power off function, if any |
| 21 | */ | 21 | */ |
| 22 | void (*pm_power_off)(void); | 22 | void (*pm_power_off)(void); |
| 23 | EXPORT_SYMBOL(pm_power_off); | ||
| 23 | 24 | ||
| 24 | static long no_idt[3]; | 25 | static long no_idt[3]; |
| 25 | static enum { | 26 | static enum { |