summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-02-03 15:48:19 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-02-03 15:48:19 -0500
commit3acb24cc46d7c5ab7d9bf7ccfaff6d68c3cf6da1 (patch)
tree01a0e06dc6239240f63080a679ade0f68a3375e8
parent914bd7b36a84b679db4eefaaa24e93ce15e76994 (diff)
downloadkernel-3acb24cc46d7c5ab7d9bf7ccfaff6d68c3cf6da1.tar.gz
kernel-3acb24cc46d7c5ab7d9bf7ccfaff6d68c3cf6da1.tar.xz
kernel-3acb24cc46d7c5ab7d9bf7ccfaff6d68c3cf6da1.zip
Goodbye iSeries. Only sfr loved you and even he's moved on
-rw-r--r--config-powerpc646
-rw-r--r--kernel.spec3
2 files changed, 6 insertions, 3 deletions
diff --git a/config-powerpc64 b/config-powerpc64
index 39f979234..f03c99124 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -5,7 +5,7 @@ CONFIG_PPC_PMAC64=y
# CONFIG_PPC_MAPLE is not set
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_IBM_CELL_BLADE is not set
-CONFIG_PPC_ISERIES=y
+# CONFIG_PPC_ISERIES is not set
CONFIG_PPC_PSERIES=y
CONFIG_PPC_PMAC=y
CONFIG_PPC_POWERNV=y
@@ -42,12 +42,12 @@ CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
CONFIG_SCSI_IPR_DUMP=y
CONFIG_HVC_RTAS=y
-CONFIG_HVC_ISERIES=y
+# CONFIG_HVC_ISERIES is not set
CONFIG_HVC_OPAL=y
# iSeries device drivers
#
-CONFIG_ISERIES_VETH=m
+# CONFIG_ISERIES_VETH is not set
CONFIG_VIODASD=m
CONFIG_VIOCD=m
CONFIG_VIOTAPE=m
diff --git a/kernel.spec b/kernel.spec
index d00e4db05..410761daa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2286,6 +2286,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Feb 03 2012 Josh Boyer <jwboyer@redhat.com>
+- Goodbye iSeries. Only sfr loved you and even he's moved on
+
* Fri Feb 03 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc2.git3.2
- Drop patch that was NAKed upstream (rhbz 783211)