diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:15 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:15 -0400 |
| commit | 49a89efbbbcc178a39555c43bd59a7593c429664 (patch) | |
| tree | 93ab78ec340d3f2fe23f9f853edd0bd62dcc64bb /arch/mips/mips-boards | |
| parent | 10cc3529072d5415fb040018a8a99aa7a60190b6 (diff) | |
[MIPS] Fix "no space between function name and open parenthesis" warnings.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards')
| -rw-r--r-- | arch/mips/mips-boards/atlas/atlas_int.c | 22 | ||||
| -rw-r--r-- | arch/mips/mips-boards/atlas/atlas_setup.c | 2 | ||||
| -rw-r--r-- | arch/mips/mips-boards/generic/init.c | 12 | ||||
| -rw-r--r-- | arch/mips/mips-boards/generic/memory.c | 4 | ||||
| -rw-r--r-- | arch/mips/mips-boards/generic/pci.c | 2 | ||||
| -rw-r--r-- | arch/mips/mips-boards/generic/time.c | 6 | ||||
| -rw-r--r-- | arch/mips/mips-boards/malta/malta_int.c | 34 | ||||
| -rw-r--r-- | arch/mips/mips-boards/malta/malta_setup.c | 10 | ||||
| -rw-r--r-- | arch/mips/mips-boards/sead/sead_int.c | 2 | ||||
| -rw-r--r-- | arch/mips/mips-boards/sead/sead_setup.c | 2 |
10 files changed, 48 insertions, 48 deletions
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c index 3c692abc2553..6fb29c3ff62d 100644 --- a/arch/mips/mips-boards/atlas/atlas_int.c +++ b/arch/mips/mips-boards/atlas/atlas_int.c | |||
| @@ -112,7 +112,7 @@ static inline void atlas_hw0_irqdispatch(void) | |||
| 112 | 112 | ||
| 113 | static inline int clz(unsigned long x) | 113 | static inline int clz(unsigned long x) |
| 114 | { | 114 | { |
| 115 | __asm__ ( | 115 | __asm__( |
| 116 | " .set push \n" | 116 | " .set push \n" |
| 117 | " .set mips32 \n" | 117 | " .set mips32 \n" |
| 118 | " clz %0, %1 \n" | 118 | " clz %0, %1 \n" |
| @@ -194,7 +194,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
| 194 | spurious_interrupt(); | 194 | spurious_interrupt(); |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | static inline void init_atlas_irqs (int base) | 197 | static inline void init_atlas_irqs(int base) |
| 198 | { | 198 | { |
| 199 | int i; | 199 | int i; |
| 200 | 200 | ||
| @@ -249,21 +249,21 @@ void __init arch_init_irq(void) | |||
| 249 | case MIPS_REVISION_CORID_CORE_24K: | 249 | case MIPS_REVISION_CORID_CORE_24K: |
| 250 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 250 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
| 251 | if (cpu_has_veic) | 251 | if (cpu_has_veic) |
| 252 | init_msc_irqs (MSC01E_INT_BASE, MSC01E_INT_BASE, | 252 | init_msc_irqs(MSC01E_INT_BASE, MSC01E_INT_BASE, |
| 253 | msc_eicirqmap, msc_nr_eicirqs); | 253 | msc_eicirqmap, msc_nr_eicirqs); |
| 254 | else | 254 | else |
| 255 | init_msc_irqs (MSC01E_INT_BASE, MSC01C_INT_BASE, | 255 | init_msc_irqs(MSC01E_INT_BASE, MSC01C_INT_BASE, |
| 256 | msc_irqmap, msc_nr_irqs); | 256 | msc_irqmap, msc_nr_irqs); |
| 257 | } | 257 | } |
| 258 | 258 | ||
| 259 | if (cpu_has_veic) { | 259 | if (cpu_has_veic) { |
| 260 | set_vi_handler (MSC01E_INT_ATLAS, atlas_hw0_irqdispatch); | 260 | set_vi_handler(MSC01E_INT_ATLAS, atlas_hw0_irqdispatch); |
| 261 | setup_irq (MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq); | 261 | setup_irq(MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq); |
| 262 | } else if (cpu_has_vint) { | 262 | } else if (cpu_has_vint) { |
| 263 | set_vi_handler (MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch); | 263 | set_vi_handler(MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch); |
| 264 | #ifdef CONFIG_MIPS_MT_SMTC | 264 | #ifdef CONFIG_MIPS_MT_SMTC |
| 265 | setup_irq_smtc (MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, | 265 | setup_irq_smtc(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, |
| 266 | &atlasirq, (0x100 << MIPSCPU_INT_ATLAS)); | 266 | &atlasirq, (0x100 << MIPSCPU_INT_ATLAS)); |
| 267 | #else /* Not SMTC */ | 267 | #else /* Not SMTC */ |
| 268 | setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq); | 268 | setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq); |
| 269 | #endif /* CONFIG_MIPS_MT_SMTC */ | 269 | #endif /* CONFIG_MIPS_MT_SMTC */ |
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c index 86bfc0548164..e405d112a067 100644 --- a/arch/mips/mips-boards/atlas/atlas_setup.c +++ b/arch/mips/mips-boards/atlas/atlas_setup.c | |||
| @@ -55,7 +55,7 @@ void __init plat_mem_setup(void) | |||
| 55 | 55 | ||
| 56 | ioport_resource.end = 0x7fffffff; | 56 | ioport_resource.end = 0x7fffffff; |
| 57 | 57 | ||
| 58 | serial_init (); | 58 | serial_init(); |
| 59 | 59 | ||
| 60 | #ifdef CONFIG_KGDB | 60 | #ifdef CONFIG_KGDB |
| 61 | kgdb_config(); | 61 | kgdb_config(); |
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index e2c7147fedf7..30f1f54cb68b 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
| @@ -166,15 +166,15 @@ static void __init console_config(void) | |||
| 166 | bits = '8'; | 166 | bits = '8'; |
| 167 | if (flow == '\0') | 167 | if (flow == '\0') |
| 168 | flow = 'r'; | 168 | flow = 'r'; |
| 169 | sprintf (console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow); | 169 | sprintf(console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow); |
| 170 | strcat (prom_getcmdline(), console_string); | 170 | strcat(prom_getcmdline(), console_string); |
| 171 | pr_info("Config serial console:%s\n", console_string); | 171 | pr_info("Config serial console:%s\n", console_string); |
| 172 | } | 172 | } |
| 173 | } | 173 | } |
| 174 | #endif | 174 | #endif |
| 175 | 175 | ||
| 176 | #ifdef CONFIG_KGDB | 176 | #ifdef CONFIG_KGDB |
| 177 | void __init kgdb_config (void) | 177 | void __init kgdb_config(void) |
| 178 | { | 178 | { |
| 179 | extern int (*generic_putDebugChar)(char); | 179 | extern int (*generic_putDebugChar)(char); |
| 180 | extern char (*generic_getDebugChar)(void); | 180 | extern char (*generic_getDebugChar)(void); |
| @@ -218,7 +218,7 @@ void __init kgdb_config (void) | |||
| 218 | { | 218 | { |
| 219 | char *s; | 219 | char *s; |
| 220 | for (s = "Please connect GDB to this port\r\n"; *s; ) | 220 | for (s = "Please connect GDB to this port\r\n"; *s; ) |
| 221 | generic_putDebugChar (*s++); | 221 | generic_putDebugChar(*s++); |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | /* Breakpoint is invoked after interrupts are initialised */ | 224 | /* Breakpoint is invoked after interrupts are initialised */ |
| @@ -226,7 +226,7 @@ void __init kgdb_config (void) | |||
| 226 | } | 226 | } |
| 227 | #endif | 227 | #endif |
| 228 | 228 | ||
| 229 | void __init mips_nmi_setup (void) | 229 | void __init mips_nmi_setup(void) |
| 230 | { | 230 | { |
| 231 | void *base; | 231 | void *base; |
| 232 | extern char except_vec_nmi; | 232 | extern char except_vec_nmi; |
| @@ -238,7 +238,7 @@ void __init mips_nmi_setup (void) | |||
| 238 | flush_icache_range((unsigned long)base, (unsigned long)base + 0x80); | 238 | flush_icache_range((unsigned long)base, (unsigned long)base + 0x80); |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | void __init mips_ejtag_setup (void) | 241 | void __init mips_ejtag_setup(void) |
| 242 | { | 242 | { |
| 243 | void *base; | 243 | void *base; |
| 244 | extern char except_vec_ejtag_debug; | 244 | extern char except_vec_ejtag_debug; |
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c index ae39953da2c4..dc272c188233 100644 --- a/arch/mips/mips-boards/generic/memory.c +++ b/arch/mips/mips-boards/generic/memory.c | |||
| @@ -125,7 +125,7 @@ struct prom_pmemblock * __init prom_getmdesc(void) | |||
| 125 | return &mdesc[0]; | 125 | return &mdesc[0]; |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | static int __init prom_memtype_classify (unsigned int type) | 128 | static int __init prom_memtype_classify(unsigned int type) |
| 129 | { | 129 | { |
| 130 | switch (type) { | 130 | switch (type) { |
| 131 | case yamon_free: | 131 | case yamon_free: |
| @@ -158,7 +158,7 @@ void __init prom_meminit(void) | |||
| 158 | long type; | 158 | long type; |
| 159 | unsigned long base, size; | 159 | unsigned long base, size; |
| 160 | 160 | ||
| 161 | type = prom_memtype_classify (p->type); | 161 | type = prom_memtype_classify(p->type); |
| 162 | base = p->base; | 162 | base = p->base; |
| 163 | size = p->size; | 163 | size = p->size; |
| 164 | 164 | ||
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c index c9852206890a..b9743190609a 100644 --- a/arch/mips/mips-boards/generic/pci.c +++ b/arch/mips/mips-boards/generic/pci.c | |||
| @@ -239,5 +239,5 @@ void __init mips_pcibios_init(void) | |||
| 239 | iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ | 239 | iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ |
| 240 | ioport_resource.end = controller->io_resource->end; | 240 | ioport_resource.end = controller->io_resource->end; |
| 241 | 241 | ||
| 242 | register_pci_controller (controller); | 242 | register_pci_controller(controller); |
| 243 | } | 243 | } |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 4fab3b2e8736..1d00b778ff1e 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
| @@ -134,7 +134,7 @@ void __init plat_time_init(void) | |||
| 134 | /* Set Data mode - binary. */ | 134 | /* Set Data mode - binary. */ |
| 135 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); | 135 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); |
| 136 | 136 | ||
| 137 | est_freq = estimate_cpu_frequency (); | 137 | est_freq = estimate_cpu_frequency(); |
| 138 | 138 | ||
| 139 | printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, | 139 | printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, |
| 140 | (est_freq%1000000)*100/1000000); | 140 | (est_freq%1000000)*100/1000000); |
| @@ -166,7 +166,7 @@ void __init plat_perf_setup(void) | |||
| 166 | 166 | ||
| 167 | #ifdef MSC01E_INT_BASE | 167 | #ifdef MSC01E_INT_BASE |
| 168 | if (cpu_has_veic) { | 168 | if (cpu_has_veic) { |
| 169 | set_vi_handler (MSC01E_INT_PERFCTR, mips_perf_dispatch); | 169 | set_vi_handler(MSC01E_INT_PERFCTR, mips_perf_dispatch); |
| 170 | cp0_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR; | 170 | cp0_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR; |
| 171 | } else | 171 | } else |
| 172 | #endif | 172 | #endif |
| @@ -183,7 +183,7 @@ void __init plat_timer_setup(struct irqaction *irq) | |||
| 183 | { | 183 | { |
| 184 | #ifdef MSC01E_INT_BASE | 184 | #ifdef MSC01E_INT_BASE |
| 185 | if (cpu_has_veic) { | 185 | if (cpu_has_veic) { |
| 186 | set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch); | 186 | set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch); |
| 187 | mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR; | 187 | mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR; |
| 188 | } | 188 | } |
| 189 | else | 189 | else |
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c index b73f21823c5e..8232392750a8 100644 --- a/arch/mips/mips-boards/malta/malta_int.c +++ b/arch/mips/mips-boards/malta/malta_int.c | |||
| @@ -178,7 +178,7 @@ static void corehi_irqdispatch(void) | |||
| 178 | 178 | ||
| 179 | static inline int clz(unsigned long x) | 179 | static inline int clz(unsigned long x) |
| 180 | { | 180 | { |
| 181 | __asm__ ( | 181 | __asm__( |
| 182 | " .set push \n" | 182 | " .set push \n" |
| 183 | " .set mips32 \n" | 183 | " .set mips32 \n" |
| 184 | " clz %0, %1 \n" | 184 | " clz %0, %1 \n" |
| @@ -303,32 +303,32 @@ void __init arch_init_irq(void) | |||
| 303 | case MIPS_REVISION_SCON_SOCIT: | 303 | case MIPS_REVISION_SCON_SOCIT: |
| 304 | case MIPS_REVISION_SCON_ROCIT: | 304 | case MIPS_REVISION_SCON_ROCIT: |
| 305 | if (cpu_has_veic) | 305 | if (cpu_has_veic) |
| 306 | init_msc_irqs (MIPS_MSC01_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); | 306 | init_msc_irqs(MIPS_MSC01_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); |
| 307 | else | 307 | else |
| 308 | init_msc_irqs (MIPS_MSC01_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs); | 308 | init_msc_irqs(MIPS_MSC01_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs); |
| 309 | break; | 309 | break; |
| 310 | 310 | ||
| 311 | case MIPS_REVISION_SCON_SOCITSC: | 311 | case MIPS_REVISION_SCON_SOCITSC: |
| 312 | case MIPS_REVISION_SCON_SOCITSCP: | 312 | case MIPS_REVISION_SCON_SOCITSCP: |
| 313 | if (cpu_has_veic) | 313 | if (cpu_has_veic) |
| 314 | init_msc_irqs (MIPS_SOCITSC_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); | 314 | init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); |
| 315 | else | 315 | else |
| 316 | init_msc_irqs (MIPS_SOCITSC_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs); | 316 | init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs); |
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | if (cpu_has_veic) { | 319 | if (cpu_has_veic) { |
| 320 | set_vi_handler (MSC01E_INT_I8259A, malta_hw0_irqdispatch); | 320 | set_vi_handler(MSC01E_INT_I8259A, malta_hw0_irqdispatch); |
| 321 | set_vi_handler (MSC01E_INT_COREHI, corehi_irqdispatch); | 321 | set_vi_handler(MSC01E_INT_COREHI, corehi_irqdispatch); |
| 322 | setup_irq (MSC01E_INT_BASE+MSC01E_INT_I8259A, &i8259irq); | 322 | setup_irq(MSC01E_INT_BASE+MSC01E_INT_I8259A, &i8259irq); |
| 323 | setup_irq (MSC01E_INT_BASE+MSC01E_INT_COREHI, &corehi_irqaction); | 323 | setup_irq(MSC01E_INT_BASE+MSC01E_INT_COREHI, &corehi_irqaction); |
| 324 | } | 324 | } |
| 325 | else if (cpu_has_vint) { | 325 | else if (cpu_has_vint) { |
| 326 | set_vi_handler (MIPSCPU_INT_I8259A, malta_hw0_irqdispatch); | 326 | set_vi_handler(MIPSCPU_INT_I8259A, malta_hw0_irqdispatch); |
| 327 | set_vi_handler (MIPSCPU_INT_COREHI, corehi_irqdispatch); | 327 | set_vi_handler(MIPSCPU_INT_COREHI, corehi_irqdispatch); |
| 328 | #ifdef CONFIG_MIPS_MT_SMTC | 328 | #ifdef CONFIG_MIPS_MT_SMTC |
| 329 | setup_irq_smtc (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq, | 329 | setup_irq_smtc(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq, |
| 330 | (0x100 << MIPSCPU_INT_I8259A)); | 330 | (0x100 << MIPSCPU_INT_I8259A)); |
| 331 | setup_irq_smtc (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, | 331 | setup_irq_smtc(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, |
| 332 | &corehi_irqaction, (0x100 << MIPSCPU_INT_COREHI)); | 332 | &corehi_irqaction, (0x100 << MIPSCPU_INT_COREHI)); |
| 333 | /* | 333 | /* |
| 334 | * Temporary hack to ensure that the subsidiary device | 334 | * Temporary hack to ensure that the subsidiary device |
| @@ -343,12 +343,12 @@ void __init arch_init_irq(void) | |||
| 343 | irq_hwmask[i] = (0x100 << MIPSCPU_INT_I8259A); | 343 | irq_hwmask[i] = (0x100 << MIPSCPU_INT_I8259A); |
| 344 | } | 344 | } |
| 345 | #else /* Not SMTC */ | 345 | #else /* Not SMTC */ |
| 346 | setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); | 346 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); |
| 347 | setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); | 347 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); |
| 348 | #endif /* CONFIG_MIPS_MT_SMTC */ | 348 | #endif /* CONFIG_MIPS_MT_SMTC */ |
| 349 | } | 349 | } |
| 350 | else { | 350 | else { |
| 351 | setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); | 351 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); |
| 352 | setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); | 352 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); |
| 353 | } | 353 | } |
| 354 | } | 354 | } |
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index a5a5a43a1984..e243d5efcb38 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c | |||
| @@ -99,7 +99,7 @@ void __init plat_mem_setup(void) | |||
| 99 | enable_dma(4); | 99 | enable_dma(4); |
| 100 | 100 | ||
| 101 | #ifdef CONFIG_KGDB | 101 | #ifdef CONFIG_KGDB |
| 102 | kgdb_config (); | 102 | kgdb_config(); |
| 103 | #endif | 103 | #endif |
| 104 | 104 | ||
| 105 | if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO) { | 105 | if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO) { |
| @@ -108,7 +108,7 @@ void __init plat_mem_setup(void) | |||
| 108 | argptr = prom_getcmdline(); | 108 | argptr = prom_getcmdline(); |
| 109 | if (strstr(argptr, "debug")) { | 109 | if (strstr(argptr, "debug")) { |
| 110 | BONITO_BONGENCFG |= BONITO_BONGENCFG_DEBUGMODE; | 110 | BONITO_BONGENCFG |= BONITO_BONGENCFG_DEBUGMODE; |
| 111 | printk ("Enabled Bonito debug mode\n"); | 111 | printk("Enabled Bonito debug mode\n"); |
| 112 | } | 112 | } |
| 113 | else | 113 | else |
| 114 | BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE; | 114 | BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE; |
| @@ -159,14 +159,14 @@ void __init plat_mem_setup(void) | |||
| 159 | if (pciclock != 33 && !strstr (argptr, "idebus=")) { | 159 | if (pciclock != 33 && !strstr (argptr, "idebus=")) { |
| 160 | printk("WARNING: PCI clock is %dMHz, setting idebus\n", pciclock); | 160 | printk("WARNING: PCI clock is %dMHz, setting idebus\n", pciclock); |
| 161 | argptr += strlen(argptr); | 161 | argptr += strlen(argptr); |
| 162 | sprintf (argptr, " idebus=%d", pciclock); | 162 | sprintf(argptr, " idebus=%d", pciclock); |
| 163 | if (pciclock < 20 || pciclock > 66) | 163 | if (pciclock < 20 || pciclock > 66) |
| 164 | printk ("WARNING: IDE timing calculations will be incorrect\n"); | 164 | printk("WARNING: IDE timing calculations will be incorrect\n"); |
| 165 | } | 165 | } |
| 166 | } | 166 | } |
| 167 | #endif | 167 | #endif |
| 168 | #ifdef CONFIG_BLK_DEV_FD | 168 | #ifdef CONFIG_BLK_DEV_FD |
| 169 | fd_activate (); | 169 | fd_activate(); |
| 170 | #endif | 170 | #endif |
| 171 | #ifdef CONFIG_VT | 171 | #ifdef CONFIG_VT |
| 172 | #if defined(CONFIG_VGA_CONSOLE) | 172 | #if defined(CONFIG_VGA_CONSOLE) |
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c index 9ca0f82f1360..ec6dd194c14a 100644 --- a/arch/mips/mips-boards/sead/sead_int.c +++ b/arch/mips/mips-boards/sead/sead_int.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | static inline int clz(unsigned long x) | 32 | static inline int clz(unsigned long x) |
| 33 | { | 33 | { |
| 34 | __asm__ ( | 34 | __asm__( |
| 35 | " .set push \n" | 35 | " .set push \n" |
| 36 | " .set mips32 \n" | 36 | " .set mips32 \n" |
| 37 | " clz %0, %1 \n" | 37 | " clz %0, %1 \n" |
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c index fad58972f3ac..1fb61b852304 100644 --- a/arch/mips/mips-boards/sead/sead_setup.c +++ b/arch/mips/mips-boards/sead/sead_setup.c | |||
| @@ -49,7 +49,7 @@ void __init plat_mem_setup(void) | |||
| 49 | { | 49 | { |
| 50 | ioport_resource.end = 0x7fffffff; | 50 | ioport_resource.end = 0x7fffffff; |
| 51 | 51 | ||
| 52 | serial_init (); | 52 | serial_init(); |
| 53 | 53 | ||
| 54 | mips_reboot_setup(); | 54 | mips_reboot_setup(); |
| 55 | } | 55 | } |
