aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/setup_32.c4
-rw-r--r--arch/powerpc/kernel/setup_64.c1
-rw-r--r--arch/powerpc/platforms/powermac/setup.c2
3 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 191d0ab09222..517ed1b1b160 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -63,10 +63,6 @@ unsigned int DMA_MODE_WRITE;
63 63
64int have_of = 1; 64int have_of = 1;
65 65
66#ifdef CONFIG_PPC_MULTIPLATFORM
67dev_t boot_dev;
68#endif /* CONFIG_PPC_MULTIPLATFORM */
69
70#ifdef CONFIG_VGA_CONSOLE 66#ifdef CONFIG_VGA_CONSOLE
71unsigned long vgacon_remap_base; 67unsigned long vgacon_remap_base;
72#endif 68#endif
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index b1b0cda3f748..ae6b67ce54e7 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -71,7 +71,6 @@
71 71
72int have_of = 1; 72int have_of = 1;
73int boot_cpuid = 0; 73int boot_cpuid = 0;
74dev_t boot_dev;
75u64 ppc64_pft_size; 74u64 ppc64_pft_size;
76 75
77/* Pick defaults since we might want to patch instructions 76/* Pick defaults since we might want to patch instructions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 824a618396ab..cb1c342061e2 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -361,7 +361,7 @@ char *bootdevice;
361void *boot_host; 361void *boot_host;
362int boot_target; 362int boot_target;
363int boot_part; 363int boot_part;
364extern dev_t boot_dev; 364static dev_t boot_dev;
365 365
366#ifdef CONFIG_SCSI 366#ifdef CONFIG_SCSI
367void __init note_scsi_host(struct device_node *node, void *host) 367void __init note_scsi_host(struct device_node *node, void *host)