aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros-2.6/files
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2007-05-23 23:10:09 +0000
committerImre Kaloz <kaloz@openwrt.org>2007-05-23 23:10:09 +0000
commitaa8d377d7eff643f6b52a09d2381db02297fe204 (patch)
treea858980772644672202fbe355d06656a636c074d /target/linux/atheros-2.6/files
parent227d9b1b0ab6893dd29f28036e9aa0a1cb139819 (diff)
downloadupstream-aa8d377d7eff643f6b52a09d2381db02297fe204.tar.gz
upstream-aa8d377d7eff643f6b52a09d2381db02297fe204.tar.bz2
upstream-aa8d377d7eff643f6b52a09d2381db02297fe204.zip
update netfilter patches, fix atheros
SVN-Revision: 7320
Diffstat (limited to 'target/linux/atheros-2.6/files')
-rw-r--r--target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h3
-rw-r--r--target/linux/atheros-2.6/files/arch/mips/atheros/irq.c2
-rw-r--r--target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c1
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h b/target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h
index 471cc7e7dc..56f63030ce 100644
--- a/target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h
+++ b/target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h
@@ -27,9 +27,8 @@
#define DO_AR5315(...)
#endif
+#include <irq.h>
-
-#define MIPS_CPU_IRQ_BASE 0x00
#define AR531X_HIGH_PRIO 0x10
#define AR531X_MISC_IRQ_BASE 0x20
#define AR531X_GPIO_IRQ_BASE 0x30
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c b/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c
index 052dbc1d23..5665aa3b93 100644
--- a/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c
+++ b/target/linux/atheros-2.6/files/arch/mips/atheros/irq.c
@@ -74,7 +74,7 @@ asmlinkage void plat_irq_dispatch(void)
void __init arch_init_irq(void)
{
clear_c0_status(ST0_IM);
- mips_cpu_irq_init(0);
+ mips_cpu_irq_init();
/* Initialize interrupt controllers */
DO_AR5312(ar5312_misc_intr_init(AR531X_MISC_IRQ_BASE);)
diff --git a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c b/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
index ef87d2014a..7bfc252efe 100644
--- a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
+++ b/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
@@ -38,6 +38,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/platform_device.h>
+#include <linux/sched.h>
#include <linux/squashfs_fs.h>
#include <linux/root_dev.h>
#include <linux/delay.h>