diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 01:27:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 01:27:50 +0100 |
| commit | 602d4a7e2f4b843d1a67375d4d7104073495b758 (patch) | |
| tree | 0b9f184e54fa693c27bd5986c114bdcf6949f788 /arch/powerpc/platforms/iseries/mf.c | |
| 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-602d4a7e2f4b843d1a67375d4d7104073495b758.tar.xz linux-602d4a7e2f4b843d1a67375d4d7104073495b758.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/iseries/mf.c')
| -rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index e5de31aa0015..49e7e4b85847 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c @@ -38,10 +38,10 @@ #include <asm/uaccess.h> #include <asm/paca.h> #include <asm/abs_addr.h> -#include <asm/iSeries/vio.h> -#include <asm/iSeries/mf.h> -#include <asm/iSeries/HvLpConfig.h> -#include <asm/iSeries/ItLpQueue.h> +#include <asm/iseries/vio.h> +#include <asm/iseries/mf.h> +#include <asm/iseries/hv_lp_config.h> +#include <asm/iseries/it_lp_queue.h> #include "setup.h" |