diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 16:27:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 16:27:50 -0800 |
| commit | 602d4a7e2f4b843d1a67375d4d7104073495b758 (patch) | |
| tree | 0b9f184e54fa693c27bd5986c114bdcf6949f788 /arch/powerpc/platforms/iseries/release_data.h | |
| parent | NFS,SUNRPC,NLM: fix unused variable warnings when CONFIG_SYSCTL is disabled (diff) | |
| parent | powerpc: Fix vmlinux.lds.S for 32-bit (diff) | |
| download | linux-dev-602d4a7e2f4b843d1a67375d4d7104073495b758.tar.xz linux-dev-602d4a7e2f4b843d1a67375d4d7104073495b758.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/iseries/release_data.h')
| -rw-r--r-- | arch/powerpc/platforms/iseries/release_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/iseries/release_data.h b/arch/powerpc/platforms/iseries/release_data.h index c68b9c3e5caf..66189fd2e32d 100644 --- a/arch/powerpc/platforms/iseries/release_data.h +++ b/arch/powerpc/platforms/iseries/release_data.h @@ -24,7 +24,7 @@ * address of the OS's NACA). */ #include <asm/types.h> -#include <asm/naca.h> +#include "naca.h" /* * When we IPL a secondary partition, we will check if if the |