aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx-2.6/files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-05-26 15:58:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-05-26 15:58:34 +0000
commitec69f770037648285896608c2788d8f14c6cc0ae (patch)
treedf414cc68c60546b0286a8642324b819b4c4fdb2 /target/linux/brcm47xx-2.6/files
parent9037e9943bb790218e8b22361ea31fda110834f1 (diff)
downloadupstream-ec69f770037648285896608c2788d8f14c6cc0ae.tar.gz
upstream-ec69f770037648285896608c2788d8f14c6cc0ae.tar.bz2
upstream-ec69f770037648285896608c2788d8f14c6cc0ae.zip
brcm47xx-2.6 cleanup, fix the kernel config
SVN-Revision: 7339
Diffstat (limited to 'target/linux/brcm47xx-2.6/files')
-rw-r--r--target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/irq.c2
-rw-r--r--target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/prom.c3
-rw-r--r--target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c1
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/irq.c b/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/irq.c
index 8727a4f956..56d4c84b7d 100644
--- a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/irq.c
+++ b/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/irq.c
@@ -59,5 +59,5 @@ void plat_irq_dispatch(void)
void __init arch_init_irq(void)
{
- mips_cpu_irq_init(0);
+ mips_cpu_irq_init();
}
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/prom.c b/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/prom.c
index 235d45aadd..41ea0870b7 100644
--- a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/prom.c
+++ b/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/prom.c
@@ -56,7 +56,6 @@ void __init prom_init(void)
add_memory_region(0, mem, BOOT_MEM_RAM);
}
-unsigned long __init prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
{
- return 0;
}
diff --git a/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c b/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
index 8d4ebe42d8..5068af848f 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
+++ b/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
@@ -40,6 +40,7 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
+#include <linux/sched.h>
#include <linux/wait.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>