[kernel/f17] Disable the PMAC ide driver. PATA_MACIO seems to work (rhbz 810579)

[Josh Boyer]

commit 1d8fbc493751ca360e3260984963b944891210c4
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Apr 10 10:58:46 2012 -0400

    Disable the PMAC ide driver.  PATA_MACIO seems to work (rhbz 810579)
    
    - Backport fixes for correct register constraints in cmpxchg.h (rhbz 809014)

 config-powerpc-generic |    3 +--
 kernel.spec            |    1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/config-powerpc-generic b/config-powerpc-generic
index a05befa..49ba30e 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -159,8 +159,7 @@ CONFIG_IDE_TASK_IOCTL=y
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
-CONFIG_BLK_DEV_IDE_PMAC=m
-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
+# CONFIG_BLK_DEV_IDE_PMAC is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
diff --git a/kernel.spec b/kernel.spec
index b076277..139d7b1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2382,6 +2382,7 @@ fi
 #              '-'
 %changelog
 * Tue Apr 10 2012 Josh Boyer <jwboyer at redhat.com>
+- Disable the PMAC ide driver.  PATA_MACIO seems to work (rhbz 810579)
 - Backport fixes for correct register constraints in cmpxchg.h (rhbz 809014)
 
 * Thu Apr 05 2012 Dave Jones <davej at redhat.com>