diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-06-06 15:26:21 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-06-06 15:26:21 -0400 |
| commit | b21ed959a4737730d522fffe02cdf0cc1370cc36 (patch) | |
| tree | 742fe9e10d0083b97204fd4a7f4731c9bb50faab | |
| parent | 4ee438e84aa8bee5a65d27076ef3436e1337a0e2 (diff) | |
| download | kernel-b21ed959a4737730d522fffe02cdf0cc1370cc36.tar.gz kernel-b21ed959a4737730d522fffe02cdf0cc1370cc36.tar.xz kernel-b21ed959a4737730d522fffe02cdf0cc1370cc36.zip | |
Disable MV643XX on ppc32 because ARM broke it (rhbz 828776)
| -rw-r--r-- | config-powerpc32-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 |
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 |