diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
| commit | d7f6884ae0ae6e406ec3500fcde16e8f51642460 (patch) | |
| tree | efceb246a4fa12921b7dbd3946a88fa257684405 /arch/i386/power/swsusp.S | |
| parent | cd28ab6a4e50a7601d22752aa7ce0c8197b10bdf (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/power/swsusp.S')
| -rw-r--r-- | arch/i386/power/swsusp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/power/swsusp.S b/arch/i386/power/swsusp.S index c4105286ff26..c893b897217f 100644 --- a/arch/i386/power/swsusp.S +++ b/arch/i386/power/swsusp.S | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
| 13 | #include <asm/segment.h> | 13 | #include <asm/segment.h> |
| 14 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 15 | #include <asm/asm_offsets.h> | 15 | #include <asm/asm-offsets.h> |
| 16 | 16 | ||
| 17 | .text | 17 | .text |
| 18 | 18 | ||