Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aebcbf39 authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[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: default avatarOlaf Hering <olaf@aepfle.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 143a42d1

arch/powerpc/configs/ppc64_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y 
# CONFIG_BLK_DEV_PDC202XX_NEW is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

CONFIG_BLK_DEV_SL82C105=y

# CONFIG_BLK_DEV_SL82C105 is not set

# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y 
# CONFIG_PATA_SIL680 is not set

# CONFIG_PATA_SIS is not set

# CONFIG_PATA_VIA is not set

# CONFIG_PATA_WINBOND is not set

CONFIG_PATA_WINBOND=y



#

# Multi-device support (RAID and LVM)

arch/powerpc/configs/pseries_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y 
# CONFIG_BLK_DEV_PDC202XX_NEW is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

CONFIG_BLK_DEV_SL82C105=y

# CONFIG_BLK_DEV_SL82C105 is not set

# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -628,7 +628,7 @@ CONFIG_ATA=y 
# CONFIG_PATA_SIL680 is not set

# CONFIG_PATA_SIS is not set

# CONFIG_PATA_VIA is not set

# CONFIG_PATA_WINBOND is not set

CONFIG_PATA_WINBOND=y



#

# Multi-device support (RAID and LVM)