summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-05-03 12:51:33 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-05-03 12:52:33 -0400
commit0aa5ea63d797dec9290bb73a6f2935a84ffced51 (patch)
treec3ce1ff98aa676bd67fbe23de88ab06f9d934b71
parent560815bd4c29bc725f198be607080a00cdf3cde9 (diff)
downloadkernel-0aa5ea63d797dec9290bb73a6f2935a84ffced51.tar.gz
kernel-0aa5ea63d797dec9290bb73a6f2935a84ffced51.tar.xz
kernel-0aa5ea63d797dec9290bb73a6f2935a84ffced51.zip
Disable PCIEPORTBUS on ppc64 per IBM request
-rw-r--r--config-powerpc641
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 0 deletions
diff --git a/config-powerpc64 b/config-powerpc64
index d099c513c..f54bcdc34 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -162,4 +162,5 @@ CONFIG_BPF_JIT=y
# CONFIG_PPC_ICSWX_PID is not set
# CONFIG_PPC_ICSWX_USE_SIGILL is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_PCIEPORTBUS is not set
diff --git a/kernel.spec b/kernel.spec
index d0453a686..de6d09ecc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2326,6 +2326,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed May 02 2012 Josh Boyer <jwboyer@redhat.com>
+- Disable PCIEPORTBUS on ppc64 per IBM request
+
* Wed May 02 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc5.git3.1
- Linux v3.4-rc5-62-g529acf5