diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/ppc/platforms | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/ppc/platforms')
| -rw-r--r-- | arch/ppc/platforms/pmac_sleep.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/pmac_sleep.S b/arch/ppc/platforms/pmac_sleep.S index 016a74649155..8d67adc76925 100644 --- a/arch/ppc/platforms/pmac_sleep.S +++ b/arch/ppc/platforms/pmac_sleep.S | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <asm/cputable.h> | 17 | #include <asm/cputable.h> |
| 18 | #include <asm/cache.h> | 18 | #include <asm/cache.h> |
| 19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
| 20 | #include <asm/offsets.h> | 20 | #include <asm/asm-offsets.h> |
| 21 | 21 | ||
| 22 | #define MAGIC 0x4c617273 /* 'Lars' */ | 22 | #define MAGIC 0x4c617273 /* 'Lars' */ |
| 23 | 23 | ||