diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /arch/powerpc/boot/Makefile | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'arch/powerpc/boot/Makefile')
| -rw-r--r-- | arch/powerpc/boot/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 98392fb5f581..dc779407de14 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -162,6 +162,7 @@ image-$(CONFIG_PPC_PSERIES) += zImage.pseries | |||
| 162 | image-$(CONFIG_PPC_MAPLE) += zImage.pseries | 162 | image-$(CONFIG_PPC_MAPLE) += zImage.pseries |
| 163 | image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries | 163 | image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries |
| 164 | image-$(CONFIG_PPC_PS3) += zImage.ps3 | 164 | image-$(CONFIG_PPC_PS3) += zImage.ps3 |
| 165 | image-$(CONFIG_PPC_CELLEB) += zImage.pseries | ||
| 165 | image-$(CONFIG_PPC_CHRP) += zImage.chrp | 166 | image-$(CONFIG_PPC_CHRP) += zImage.chrp |
| 166 | image-$(CONFIG_PPC_EFIKA) += zImage.chrp | 167 | image-$(CONFIG_PPC_EFIKA) += zImage.chrp |
| 167 | image-$(CONFIG_PPC_PMAC) += zImage.pmac | 168 | image-$(CONFIG_PPC_PMAC) += zImage.pmac |