diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:07:28 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:07:28 +0400 |
commit | ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (patch) | |
tree | 3666d029b4bd4df2909dbefd9c7a09e6042b7d32 /arch/ppc64/kernel/ras.c | |
parent | 8bf62ecee58360749c5f0e68bc97d5e02a6816b1 (diff) | |
parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
download | linux-ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef.tar.xz |
Merge upstream kernel changes into 'C/H/S support' branch of libata.
Diffstat (limited to 'arch/ppc64/kernel/ras.c')
-rw-r--r-- | arch/ppc64/kernel/ras.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/ras.c b/arch/ppc64/kernel/ras.c index 1c4c796b212b..3c00f7bfc1b5 100644 --- a/arch/ppc64/kernel/ras.c +++ b/arch/ppc64/kernel/ras.c @@ -47,7 +47,6 @@ #include <asm/cache.h> #include <asm/prom.h> #include <asm/ptrace.h> -#include <asm/iSeries/LparData.h> #include <asm/machdep.h> #include <asm/rtas.h> #include <asm/ppcdebug.h> |