[git pull] powerpc allmodconfig build fix and missed 5200 audio drivers (Was: [PATCH] powerpc: fix i8042 module build error)
From: Grant Likely <hidden>
Date: 2010-08-07 03:55:35
Hi Ben, Here's the promised pull request: Let me know if this is okay, or if you would like to respin it. The 2 mpc5200 patches are in here (and not in my previous request) because of a breakdown in coordination between me and the ASoC folks. Turns out the (potentially) conflicting patches weren't ready for 2.6.36, so Mark asked me to pick them back up[1]. It also has the powerpc allmodconfig build failure fix. [1]http://www.mail-archive.com/linuxppc-dev@lists.ozlabs.org/msg45616.html Cheers, g. The following changes since commit 17879857821adad4e180c5d6457c3b8bbf1d0c0c= : Linus Torvalds (1): Merge branch 'irq-core-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip are available in the git repository at: git://git.secretlab.ca/git/linux-2.6 next Eric Millbrandt (2): powerpc/5200: add mpc5200_psc_ac97_gpio_reset sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset Grant Likely (1): powerpc: fix i8042 module build error arch/powerpc/include/asm/mpc52xx.h | 1 + arch/powerpc/include/asm/mpc52xx_psc.h | 1 + arch/powerpc/kernel/setup-common.c | 2 + arch/powerpc/platforms/52xx/mpc52xx_common.c | 106 ++++++++++++++++++++++= ++++ sound/soc/fsl/mpc5200_psc_ac97.c | 22 +++++- 5 files changed, 128 insertions(+), 4 deletions(-) On Fri, Aug 6, 2010 at 8:54 PM, Grant Likely [off-list ref] wr= ote:
On Fri, Aug 6, 2010 at 6:01 PM, Stephen Rothwell [off-list ref] w=
rote:
quoted
Hi Grant, On Fri, 06 Aug 2010 12:42:12 -0600 Grant Likely <grant.likely@secretlab.=
ca> wrote:
quoted
quoted
of_i8042_{kbd,aux}_irq needs to be exported Signed-off-by: Grant Likely <redacted> --- Stephen and Ben, this fixes up the build error in linux-next. =A0If you=
prefer,
quoted
quoted
I can stuff this patch into my next-powerpc branch. =A0Ben, I've got ot=
her
quoted
quoted
commits in that branch that I'll be sending to you early next week anyw=
ay.
quoted
This failure also exists in Linus' tree, so the earlier this goes to Linus the better.Okay then. =A0Ben, I'll send out my pull request out right away so you've got it if you want to use it. Cheers, g.quoted
-- Cheers, Stephen Rothwell =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sfr@canb.auug.or=
g.au
-- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.
--=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.