diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2006-01-06 00:11:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 08:33:31 -0800 |
| commit | 683e2cc6dc5aa9bb4ba2f2e0662df9d7f0a1d6c2 (patch) | |
| tree | 3aa321a15772f55f23584fc73b6ba29be2dd481f /arch/ppc/boot | |
| parent | f80257a25d9f73a0e6e377c7d6bf29b8938c042d (diff) | |
| download | linux-3.10-683e2cc6dc5aa9bb4ba2f2e0662df9d7f0a1d6c2.tar.gz linux-3.10-683e2cc6dc5aa9bb4ba2f2e0662df9d7f0a1d6c2.tar.bz2 linux-3.10-683e2cc6dc5aa9bb4ba2f2e0662df9d7f0a1d6c2.zip | |
[PATCH] ppc32: Re-add embed_config.c to ml300/ep405
Commit 3e9e7c1d0b7a36fb8affb973a054c5098e27baa8 (ppc32: cleanup AMCC PPC40x
eval boards to support U-Boot) broke the kernel for ML300 / EP405.
It still compiles as there's a weak definition of the function in
misc-embedded.c, but the kernel crashes as the bd_t fixup isn't performed.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/boot')
| -rw-r--r-- | arch/ppc/boot/simple/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index f3e9c534aa8..9533f8de238 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile @@ -190,6 +190,8 @@ boot-$(CONFIG_REDWOOD_5) += embed_config.o boot-$(CONFIG_REDWOOD_6) += embed_config.o boot-$(CONFIG_8xx) += embed_config.o boot-$(CONFIG_8260) += embed_config.o +boot-$(CONFIG_EP405) += embed_config.o +boot-$(CONFIG_XILINX_ML300) += embed_config.o boot-$(CONFIG_BSEIP) += iic.o boot-$(CONFIG_MBX) += iic.o pci.o qspan_pci.o boot-$(CONFIG_MV64X60) += misc-mv64x60.o |