aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/Kconfig2
-rw-r--r--arch/ppc/boot/simple/misc.c2
-rw-r--r--arch/ppc/boot/simple/mpc10x_memory.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 10162b187b..848f43970a 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -905,6 +905,8 @@ config PREEMPT
905config HIGHMEM 905config HIGHMEM
906 bool "High memory support" 906 bool "High memory support"
907 907
908source "mm/Kconfig"
909
908source "fs/Kconfig.binfmt" 910source "fs/Kconfig.binfmt"
909 911
910config PROC_DEVICETREE 912config PROC_DEVICETREE
diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
index ab0f9902cb..e02de5b467 100644
--- a/arch/ppc/boot/simple/misc.c
+++ b/arch/ppc/boot/simple/misc.c
@@ -222,7 +222,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
222 puts("\n"); 222 puts("\n");
223 223
224 puts("Uncompressing Linux..."); 224 puts("Uncompressing Linux...");
225 gunzip(0x0, 0x400000, zimage_start, &zimage_size); 225 gunzip(NULL, 0x400000, zimage_start, &zimage_size);
226 puts("done.\n"); 226 puts("done.\n");
227 227
228 /* get the bi_rec address */ 228 /* get the bi_rec address */
diff --git a/arch/ppc/boot/simple/mpc10x_memory.c b/arch/ppc/boot/simple/mpc10x_memory.c
index 977daedc14..20d92a34ce 100644
--- a/arch/ppc/boot/simple/mpc10x_memory.c
+++ b/arch/ppc/boot/simple/mpc10x_memory.c
@@ -33,7 +33,7 @@
33 33
34#define MPC10X_PCI_OP(rw, size, type, op, mask) \ 34#define MPC10X_PCI_OP(rw, size, type, op, mask) \
35static void \ 35static void \
36mpc10x_##rw##_config_##size(unsigned int *cfg_addr, \ 36mpc10x_##rw##_config_##size(unsigned int __iomem *cfg_addr, \
37 unsigned int *cfg_data, int devfn, int offset, \ 37 unsigned int *cfg_data, int devfn, int offset, \
38 type val) \ 38 type val) \
39{ \ 39{ \