summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-04-10 10:58:46 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-04-10 10:59:05 -0400
commitdfe7e131a269860221ee8d0d2bb9555e5a89eb5e (patch)
tree53b36143aaa5252323bbb1270933a2ffb11ac4be
parent2b52cb39e3bde3243606bab2218684db1c1c580f (diff)
downloadkernel-dfe7e131a269860221ee8d0d2bb9555e5a89eb5e.tar.gz
kernel-dfe7e131a269860221ee8d0d2bb9555e5a89eb5e.tar.xz
kernel-dfe7e131a269860221ee8d0d2bb9555e5a89eb5e.zip
Disable the PMAC ide driver. PATA_MACIO seems to work (rhbz 810579)
- Backport fixes for correct register constraints in cmpxchg.h (rhbz 809014)
-rw-r--r--config-powerpc-generic3
-rw-r--r--kernel.spec1
2 files changed, 2 insertions, 2 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic
index a05befa1d..49ba30efe 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 894304ecd..a536d8b59 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2308,6 +2308,7 @@ fi
# || ||
%changelog
* Tue Apr 10 2012 Josh Boyer <jwboyer@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)
* Mon Apr 09 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc2.git0.3