diff options
Diffstat (limited to 'arch/mips/powertv/asic/asic_devices.c')
-rw-r--r-- | arch/mips/powertv/asic/asic_devices.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c index 0238af1ba503..8380605d597d 100644 --- a/arch/mips/powertv/asic/asic_devices.c +++ b/arch/mips/powertv/asic/asic_devices.c | |||
@@ -147,20 +147,10 @@ static __init noinline void platform_set_family(void) | |||
147 | if (check_forcefamily(forced_family) == 0) | 147 | if (check_forcefamily(forced_family) == 0) |
148 | bootldr_family = BOOTLDRFAMILY(forced_family[0], | 148 | bootldr_family = BOOTLDRFAMILY(forced_family[0], |
149 | forced_family[1]); | 149 | forced_family[1]); |
150 | else { | 150 | else |
151 | |||
152 | #ifdef CONFIG_BOOTLOADER_DRIVER | ||
153 | bootldr_family = (unsigned short) kbldr_GetSWFamily(); | ||
154 | #else | ||
155 | #if defined(CONFIG_BOOTLOADER_FAMILY) | ||
156 | bootldr_family = (unsigned short) BOOTLDRFAMILY( | 151 | bootldr_family = (unsigned short) BOOTLDRFAMILY( |
157 | CONFIG_BOOTLOADER_FAMILY[0], | 152 | CONFIG_BOOTLOADER_FAMILY[0], |
158 | CONFIG_BOOTLOADER_FAMILY[1]); | 153 | CONFIG_BOOTLOADER_FAMILY[1]); |
159 | #else | ||
160 | #error "Unknown Bootloader Family" | ||
161 | #endif | ||
162 | #endif | ||
163 | } | ||
164 | 154 | ||
165 | pr_info("Bootloader Family = 0x%04X\n", bootldr_family); | 155 | pr_info("Bootloader Family = 0x%04X\n", bootldr_family); |
166 | 156 | ||