diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 21:45:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 21:45:04 +0200 |
| commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
| tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /arch/ppc/kernel/idle_power4.S | |
| parent | [PATCH] crc16: remove w1 specific comments. (diff) | |
| parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
| download | linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.xz linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.zip | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/ppc/kernel/idle_power4.S')
| -rw-r--r-- | arch/ppc/kernel/idle_power4.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/idle_power4.S b/arch/ppc/kernel/idle_power4.S index 73a58ff03900..cc0d535365cd 100644 --- a/arch/ppc/kernel/idle_power4.S +++ b/arch/ppc/kernel/idle_power4.S @@ -20,7 +20,7 @@ #include <asm/cputable.h> #include <asm/thread_info.h> #include <asm/ppc_asm.h> -#include <asm/offsets.h> +#include <asm/asm-offsets.h> #undef DEBUG |