diff options
Diffstat (limited to 'arch/mips/gt64120/momenco_ocelot')
-rw-r--r-- | arch/mips/gt64120/momenco_ocelot/dbg_io.c | 4 | ||||
-rw-r--r-- | arch/mips/gt64120/momenco_ocelot/irq.c | 4 | ||||
-rw-r--r-- | arch/mips/gt64120/momenco_ocelot/prom.c | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/mips/gt64120/momenco_ocelot/dbg_io.c b/arch/mips/gt64120/momenco_ocelot/dbg_io.c index 2128684584f5..32d6fb4ee679 100644 --- a/arch/mips/gt64120/momenco_ocelot/dbg_io.c +++ b/arch/mips/gt64120/momenco_ocelot/dbg_io.c | |||
@@ -1,6 +1,4 @@ | |||
1 | 1 | ||
2 | #ifdef CONFIG_KGDB | ||
3 | |||
4 | #include <asm/serial.h> /* For the serial port location and base baud */ | 2 | #include <asm/serial.h> /* For the serial port location and base baud */ |
5 | 3 | ||
6 | /* --- CONFIG --- */ | 4 | /* --- CONFIG --- */ |
@@ -121,5 +119,3 @@ int putDebugChar(uint8 byte) | |||
121 | UART16550_WRITE(OFS_SEND_BUFFER, byte); | 119 | UART16550_WRITE(OFS_SEND_BUFFER, byte); |
122 | return 1; | 120 | return 1; |
123 | } | 121 | } |
124 | |||
125 | #endif | ||
diff --git a/arch/mips/gt64120/momenco_ocelot/irq.c b/arch/mips/gt64120/momenco_ocelot/irq.c index d9294401ccb0..2585d9dbda33 100644 --- a/arch/mips/gt64120/momenco_ocelot/irq.c +++ b/arch/mips/gt64120/momenco_ocelot/irq.c | |||
@@ -90,6 +90,6 @@ void __init arch_init_irq(void) | |||
90 | clear_c0_status(ST0_IM); | 90 | clear_c0_status(ST0_IM); |
91 | local_irq_disable(); | 91 | local_irq_disable(); |
92 | 92 | ||
93 | mips_cpu_irq_init(0); | 93 | mips_cpu_irq_init(); |
94 | rm7k_cpu_irq_init(8); | 94 | rm7k_cpu_irq_init(); |
95 | } | 95 | } |
diff --git a/arch/mips/gt64120/momenco_ocelot/prom.c b/arch/mips/gt64120/momenco_ocelot/prom.c index 8677b6d3ada7..78f393b2afd9 100644 --- a/arch/mips/gt64120/momenco_ocelot/prom.c +++ b/arch/mips/gt64120/momenco_ocelot/prom.c | |||
@@ -67,7 +67,6 @@ void __init prom_init(void) | |||
67 | add_memory_region(0, 64 << 20, BOOT_MEM_RAM); | 67 | add_memory_region(0, 64 << 20, BOOT_MEM_RAM); |
68 | } | 68 | } |
69 | 69 | ||
70 | unsigned long __init prom_free_prom_memory(void) | 70 | void __init prom_free_prom_memory(void) |
71 | { | 71 | { |
72 | return 0; | ||
73 | } | 72 | } |