diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 17:47:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 17:47:23 -0400 |
| commit | 6e21ce9d816b9ecc2349ad652fee9c6f28c43877 (patch) | |
| tree | a598c00d6f9615e99673d348de93b3d31adf4911 /drivers/ide/ppc/mpc8xx.c | |
| parent | 01a6a7790e8e466584fc845f3cfc1770ffa1fee5 (diff) | |
| parent | 56fe23d5a702a39ee3bb29a04b55db292479d07a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
pdc202xx_new: PLL detection fix
via82cxxx: add Arima W730-K8 and other rebadgings to short cables list
pmac: build fix
pata_ali/alim15x3: override 80-wire cable detection for Toshiba S1800-814
hpt366: UltraDMA filter for SATA cards (take 2)
ide: add ide_dev_is_sata() helper (take 2)
hpt366: fix PCI clock detection for HPT374 (take 4)
pdc202xx_new: fix PCI refcounting
ide: fix PCI refcounting
mpc8xx: Only build mpc8xx on arch/ppc
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> |