summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-powerpc32-generic2
-rw-r--r--kernel.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/config-powerpc32-generic b/config-powerpc32-generic
index 976e45e64..935aab420 100644
--- a/config-powerpc32-generic
+++ b/config-powerpc32-generic
@@ -47,7 +47,7 @@ CONFIG_NET_VENDOR_APPLE=y
CONFIG_BMAC=m
CONFIG_MACE=m
# CONFIG_MACE_AAUI_PORT is not set
-CONFIG_MV643XX_ETH=m
+# CONFIG_MV643XX_ETH is not set
CONFIG_I2C_HYDRA=m
CONFIG_I2C_MPC=m
CONFIG_THERM_WINDTUNNEL=m
diff --git a/kernel.spec b/kernel.spec
index f6b9a90fb..d0dc83fce 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2278,6 +2278,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Jun 05 2012 Josh Boyer <jwboyer@redhat.com>
+- Disable MV643XX on ppc32 because ARM broke it (rhbz 828776)
+
* Tue Jun 05 2012 Peter Robinson <pbrobinson@fedoraproject.org>
- Update ARM config options for 3.5
- Enable MTD/UBI/JFFS2 on ARM platforms