diff options
author | s.hauer@pengutronix.de <s.hauer@pengutronix.de> | 2006-11-02 07:56:10 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-11-12 22:44:59 -0500 |
commit | fd6e7d2d6a0231ebfa08e1f9a323497ea548da7d (patch) | |
tree | 789866164c4d6e1eec6039f75155bd7f1c97b67e | |
parent | 99a565bab1a41819b9f85c8c069a2f3fc6e27d55 (diff) |
[PATCH] Clean up usage of boot_dev
dev_t boot_dev is declared in arch/powerpc/kernel/setup_32.c
and in arch/powerpc/kernel/setup_64.c but not used in these files.
It is only used in arch/powerpc/platforms/powermac/setup.c, so make
it static in this file.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 2 |
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 | ||
64 | int have_of = 1; | 64 | int have_of = 1; |
65 | 65 | ||
66 | #ifdef CONFIG_PPC_MULTIPLATFORM | ||
67 | dev_t boot_dev; | ||
68 | #endif /* CONFIG_PPC_MULTIPLATFORM */ | ||
69 | |||
70 | #ifdef CONFIG_VGA_CONSOLE | 66 | #ifdef CONFIG_VGA_CONSOLE |
71 | unsigned long vgacon_remap_base; | 67 | unsigned 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 | ||
72 | int have_of = 1; | 72 | int have_of = 1; |
73 | int boot_cpuid = 0; | 73 | int boot_cpuid = 0; |
74 | dev_t boot_dev; | ||
75 | u64 ppc64_pft_size; | 74 | u64 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; | |||
361 | void *boot_host; | 361 | void *boot_host; |
362 | int boot_target; | 362 | int boot_target; |
363 | int boot_part; | 363 | int boot_part; |
364 | extern dev_t boot_dev; | 364 | static dev_t boot_dev; |
365 | 365 | ||
366 | #ifdef CONFIG_SCSI | 366 | #ifdef CONFIG_SCSI |
367 | void __init note_scsi_host(struct device_node *node, void *host) | 367 | void __init note_scsi_host(struct device_node *node, void *host) |