From 56c7c76f07ce86ffb3eaa801ac8a7b43dc341cfe Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 7 Aug 2011 16:20:53 +0000
Subject: [PATCH] [powerpc] Use libata-based drivers for most PATA controllers
 (Closes: #636854):

- Various drivers replaced as for x86 in 2.6.32-10
- pata_macio replaces ide_pmac

svn path=/dists/trunk/linux-2.6/; revision=17889
---
 debian/changelog             |  4 ++++
 debian/config/powerpc/config | 28 ++++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2d9d0913..632283f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * linux-libc-dev: Install include/asm under arch-specific directory;
     mark package as multi-arch-coinstallable (Multi-Arch: same)
+  * [powerpc] Use libata-based drivers for most PATA controllers
+    (Closes: #636854):
+    - Various drivers replaced as for x86 in 2.6.32-10
+    - pata_macio replaces ide_pmac
 
   [ maximilian attems ]
   * Add stable 3.0.1 including:
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index 9a3248491..db23873bd 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -78,7 +78,16 @@ CONFIG_PROC_PREPRESIDUAL=y
 ##
 ## file: drivers/ata/Kconfig
 ##
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_NS87410=m
 CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_MACIO=m
 
 ##
 ## file: drivers/atm/Kconfig
@@ -272,9 +281,9 @@ CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 # CONFIG_IDE_GENERIC is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
+# CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_AEC62XX=m
+# CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
 # CONFIG_BLK_DEV_CMD64X is not set
@@ -283,19 +292,18 @@ CONFIG_BLK_DEV_AEC62XX=m
 # CONFIG_BLK_DEV_CS5520 is not set
 # CONFIG_BLK_DEV_CS5530 is not set
 CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_SC1200=m
+# CONFIG_BLK_DEV_SC1200 is not set
 # CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
-CONFIG_BLK_DEV_SIIMAGE=m
+# CONFIG_BLK_DEV_SIIMAGE is not set
 CONFIG_BLK_DEV_SL82C105=m
 # CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_IDE_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_IDE_PMAC is not set
 
 ##
 ## file: drivers/input/gameport/Kconfig