diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /arch/sparc64/kernel/power.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'arch/sparc64/kernel/power.c')
| -rw-r--r-- | arch/sparc64/kernel/power.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c index 52f14e399b1c..533104c7907d 100644 --- a/arch/sparc64/kernel/power.c +++ b/arch/sparc64/kernel/power.c | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #define __KERNEL_SYSCALLS__ | ||
| 8 | |||
| 7 | #include <linux/config.h> | 9 | #include <linux/config.h> |
| 8 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 9 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| @@ -17,7 +19,6 @@ | |||
| 17 | #include <asm/ebus.h> | 19 | #include <asm/ebus.h> |
| 18 | #include <asm/auxio.h> | 20 | #include <asm/auxio.h> |
| 19 | 21 | ||
| 20 | #define __KERNEL_SYSCALLS__ | ||
| 21 | #include <linux/unistd.h> | 22 | #include <linux/unistd.h> |
| 22 | 23 | ||
| 23 | /* | 24 | /* |