Please pull powerpc.git merge branch
Paul Mackerras
paulus at samba.org
Thu Jul 5 11:45:30 EST 2007
Linus,
Did my pull request fall through the cracks, or is there a problem
with it?
Please do
git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
Thanks,
Paul.
arch/powerpc/configs/mpc7448_hpc2_defconfig | 212 +++++++-----------
arch/powerpc/configs/mpc8272_ads_defconfig | 293 +++++++++++++++----------
arch/powerpc/configs/mpc8313_rdb_defconfig | 310 +++++++++++++-------------
arch/powerpc/configs/mpc832x_mds_defconfig | 176 ++++++---------
arch/powerpc/configs/mpc832x_rdb_defconfig | 229 ++++++++-----------
arch/powerpc/configs/mpc834x_itx_defconfig | 265 +++++++++++-----------
arch/powerpc/configs/mpc834x_itxgp_defconfig | 232 ++++++++++---------
arch/powerpc/configs/mpc834x_mds_defconfig | 195 ++++++++--------
arch/powerpc/configs/mpc836x_mds_defconfig | 176 ++++++---------
arch/powerpc/configs/mpc8540_ads_defconfig | 201 ++++++++---------
arch/powerpc/configs/mpc8544_ds_defconfig | 193 +++++++---------
arch/powerpc/configs/mpc8560_ads_defconfig | 201 ++++++++---------
arch/powerpc/configs/mpc8568mds_defconfig | 191 +++++++---------
arch/powerpc/configs/mpc85xx_cds_defconfig | 206 +++++++++--------
arch/powerpc/configs/mpc8641_hpcn_defconfig | 200 ++++++++---------
arch/powerpc/configs/mpc866_ads_defconfig | 213 +++++++++---------
arch/powerpc/configs/mpc885_ads_defconfig | 222 +++++++++----------
arch/powerpc/kernel/irq.c | 6 +
arch/powerpc/platforms/cell/cbe_cpufreq.c | 15 +
drivers/net/Kconfig | 2
include/asm-powerpc/irq.h | 5
21 files changed, 1781 insertions(+), 1962 deletions(-)
commit 795bb15e0735bd2b0015ca333fa157399b72c168
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Mon Jul 2 00:04:36 2007 -0500
[POWERPC] Update defconfigs
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 9f7905812e5919862acb6ede63e10d3d1bb4958e
Author: Olof Johansson <olof at lixom.net>
Date: Mon Jun 4 14:47:04 2007 +1000
[POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
Uninline virq_to_hw and export it so modules can use it. The alternative
would be to export the irq_map array instead, but it's an infrequently
called function, and keeping the array unexported seems considerably
cleaner.
This is needed so that the pasemi_mac driver can be compiled as a module.
Signed-off-by: Olof Johansson <olof at lixom.net>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit ee5d1b7f2a01ce4d95ca247b5a499b72f31cdbe8
Author: Christian Krafft <krafft at de.ibm.com>
Date: Thu Jun 28 21:14:38 2007 +1000
[POWERPC] Fix PMI breakage in cbe_cbufreq driver
The recent change to cell_defconfig to enable cpufreq on Cell exposed
the fact that the cbe_cpufreq driver currently needs the PMI interface
code to compile, but Kconfig doesn't make sure that the PMI interface
code gets built if cbe_cpufreq is enabled.
In fact cbe_cpufreq can work without PMI, so this ifdefs out the code
that deals with PMI. This is a minimal solution for 2.6.22; a more
comprehensive solution will be merged for 2.6.23.
Signed-off-by: Christian Krafft <krafft at de.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 86affd5a00a92e491e5f00ed659492767519fdf7
Author: David Gibson <david at gibson.dropbear.id.au>
Date: Thu Jun 28 11:27:57 2007 +1000
[POWERPC] Disable old EMAC driver in arch/powerpc
The EMAC driver, in drivers/net/ibm_emac, for the embedded Ethernet
MAC found in PowerPC 4xx embedded chips is not suitable for
arch/powerpc. It will not build because it relies on the old arch/ppc
OCP mechanism. BenH has a new, device-tree aware version of the
driver which will work in arch/powerpc, but until it's merged, this
patch will disable the old, non-building version.
Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
More information about the Linuxppc-dev
mailing list