fix ar7 compile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7331 3c298f89-4303-0410-b956-a3cf2f4a3e73

8 files changed, 10 insertions, 17 deletions

diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c b/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
index 3019952273..542a57a24a 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
@@ -117,7 +117,7 @@ static void ar7_mask_secondary_irq(unsigned int irq)
 }
 
 void __init arch_init_irq(void) {
-	mips_cpu_irq_init(0);
+	mips_cpu_irq_init();
 	ar7_irq_init(8);
 }
 
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
index 10dc09da42..8ff571ce27 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
@@ -188,7 +188,7 @@ void __init prom_meminit(void)
 #endif
 }
 
-unsigned long __init prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
 {
-	return 0;
+	return;
 }
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
index 00cb4a6de3..20926c67eb 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
@@ -279,7 +279,6 @@ static void __init console_config(void)
 
 void __init prom_init(void)
 {
-	prom_printf("\nLINUX running...\n");
 	ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
 	ar7_init_env((struct env_var *)fw_arg2);
 	console_config();
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
index fb3d20c183..7930e90b24 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
@@ -49,15 +49,13 @@ static void ar7_machine_power_off(void);
 
 static void ar7_machine_restart(char *command)
 {
-        volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
+	volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
 						   AR7_RESET_SOFTWARE, 1);
-	prom_printf("Reboot\n");
-        *softres_reg = 1;
+	*softres_reg = 1;
 }
 
 static void ar7_machine_halt(void)
 {
-	prom_printf("Halt\n");
 	while (1);
 }
 
@@ -65,8 +63,7 @@ static void ar7_machine_power_off(void)
 {
         volatile u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
 	u32 power_state = *power_reg | (3 << 30);
-	prom_printf("Power off\n");
-        *power_reg = power_state;
+	*power_reg = power_state;
 	ar7_machine_halt();
 }
 
diff --git a/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c b/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c
index d8dc2e1ff5..df8e7634eb 100644
--- a/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c
+++ b/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c
@@ -30,8 +30,7 @@
 
 #include <linux/types.h>
 #include <linux/cdev.h>
-
-#include <asm/gpio.h>
+#include <gpio.h>
 
 #define DRVNAME "ar7_gpio"
 #define LONGNAME "TI AR7 GPIOs Driver"
diff --git a/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c b/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c
index fbef7d3bbf..2de72ab612 100644
--- a/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c
+++ b/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c
@@ -25,8 +25,7 @@
 #include <linux/leds.h>
 #include <linux/err.h>
 #include <asm/io.h>
-
-#include <asm/gpio.h>
+#include <gpio.h>
 
 #define DRVNAME "ar7-leds"
 #define LONGNAME "TI AR7 LEDs driver"
diff --git a/target/linux/ar7-2.6/files/drivers/net/cpmac.c b/target/linux/ar7-2.6/files/drivers/net/cpmac.c
index 4d957f0113..e0c49b7083 100644
--- a/target/linux/ar7-2.6/files/drivers/net/cpmac.c
+++ b/target/linux/ar7-2.6/files/drivers/net/cpmac.c
@@ -38,7 +38,7 @@
 #include <linux/phy.h>
 #include <linux/platform_device.h>
 #include <asm/ar7/ar7.h>
-#include <asm/gpio.h>
+#include <gpio.h>
 
 MODULE_AUTHOR("Eugene Konev");
 MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h b/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h
index 367fe2d344..4e082f824f 100644
--- a/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h
+++ b/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h
@@ -10,7 +10,6 @@
 #ifndef _ASM_AR7_SPACES_H
 #define _ASM_AR7_SPACES_H
 
-
 #define CAC_BASE		0x80000000
 #define IO_BASE			0xa0000000
 #define UNCAC_BASE		0xa0000000
@@ -21,7 +20,7 @@
  * We handle pages at KSEG0 for kernels with 32 bit address space.
  */
 #define PAGE_OFFSET		0x80000000UL
-#define ARCH_PFN_OFFSET	(0x14000000 >> PAGE_SHIFT)
+#define PHYS_OFFSET 	0x14000000UL
 
 /*
  * Memory above this physical address will be considered highmem.