diff options
| author | Olaf Hering <olaf@aepfle.de> | 2007-02-16 04:20:46 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-16 18:21:26 -0500 |
| commit | aebcbf39be0aadded32f4cd82c1d88a8cac4614b (patch) | |
| tree | 6047eeec3ce02c0122ce26ff20e93aece6142889 | |
| parent | 143a42d16a18303d5c8d625730546f8b515b5d54 (diff) | |
[POWERPC] use winbond libata instead of ide driver for pseries CD drives
Change the default for the built-in IDE on p610/p615/p630 from
ide to libata. libata has better error handling and the drive can
recover when hald does its CD media polling.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index debac66e8258..a8da0aea3b87 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 500 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 500 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 501 | # CONFIG_BLK_DEV_SVWKS is not set | 501 | # CONFIG_BLK_DEV_SVWKS is not set |
| 502 | # CONFIG_BLK_DEV_SIIMAGE is not set | 502 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 503 | CONFIG_BLK_DEV_SL82C105=y | 503 | # CONFIG_BLK_DEV_SL82C105 is not set |
| 504 | # CONFIG_BLK_DEV_SLC90E66 is not set | 504 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 505 | # CONFIG_BLK_DEV_TRM290 is not set | 505 | # CONFIG_BLK_DEV_TRM290 is not set |
| 506 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 506 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| @@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y | |||
| 646 | # CONFIG_PATA_SIL680 is not set | 646 | # CONFIG_PATA_SIL680 is not set |
| 647 | # CONFIG_PATA_SIS is not set | 647 | # CONFIG_PATA_SIS is not set |
| 648 | # CONFIG_PATA_VIA is not set | 648 | # CONFIG_PATA_VIA is not set |
| 649 | # CONFIG_PATA_WINBOND is not set | 649 | CONFIG_PATA_WINBOND=y |
| 650 | 650 | ||
| 651 | # | 651 | # |
| 652 | # Multi-device support (RAID and LVM) | 652 | # Multi-device support (RAID and LVM) |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 1c794fe718fd..6e96e50c362d 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 483 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 483 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
| 484 | # CONFIG_BLK_DEV_SVWKS is not set | 484 | # CONFIG_BLK_DEV_SVWKS is not set |
| 485 | # CONFIG_BLK_DEV_SIIMAGE is not set | 485 | # CONFIG_BLK_DEV_SIIMAGE is not set |
| 486 | CONFIG_BLK_DEV_SL82C105=y | 486 | # CONFIG_BLK_DEV_SL82C105 is not set |
| 487 | # CONFIG_BLK_DEV_SLC90E66 is not set | 487 | # CONFIG_BLK_DEV_SLC90E66 is not set |
| 488 | # CONFIG_BLK_DEV_TRM290 is not set | 488 | # CONFIG_BLK_DEV_TRM290 is not set |
| 489 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 489 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| @@ -628,7 +628,7 @@ CONFIG_ATA=y | |||
| 628 | # CONFIG_PATA_SIL680 is not set | 628 | # CONFIG_PATA_SIL680 is not set |
| 629 | # CONFIG_PATA_SIS is not set | 629 | # CONFIG_PATA_SIS is not set |
| 630 | # CONFIG_PATA_VIA is not set | 630 | # CONFIG_PATA_VIA is not set |
| 631 | # CONFIG_PATA_WINBOND is not set | 631 | CONFIG_PATA_WINBOND=y |
| 632 | 632 | ||
| 633 | # | 633 | # |
| 634 | # Multi-device support (RAID and LVM) | 634 | # Multi-device support (RAID and LVM) |