diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /drivers/ide/ppc/mpc8xx.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/ide/ppc/mpc8xx.c')
| -rw-r--r-- | drivers/ide/ppc/mpc8xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c index 8859fe2f5ac2..dab79afa9b22 100644 --- a/drivers/ide/ppc/mpc8xx.c +++ b/drivers/ide/ppc/mpc8xx.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <asm/mpc8xx.h> | 32 | #include <asm/mpc8xx.h> |
| 33 | #include <asm/mmu.h> | 33 | #include <asm/mmu.h> |
| 34 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
| 35 | #include <asm/residual.h> | ||
| 36 | #include <asm/io.h> | 35 | #include <asm/io.h> |
| 37 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
| 38 | #include <asm/ide.h> | 37 | #include <asm/ide.h> |