projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UML target completed. Added ext2 target fs for use with uml images
[openwrt.git]
/
target
/
linux
/
aruba-2.6
/
patches
/
000-aruba.patch
diff --git
a/target/linux/aruba-2.6/patches/000-aruba.patch
b/target/linux/aruba-2.6/patches/000-aruba.patch
index
52fb3ba
..
1db6831
100644
(file)
--- a/
target/linux/aruba-2.6/patches/000-aruba.patch
+++ b/
target/linux/aruba-2.6/patches/000-aruba.patch
@@
-45,7
+45,7
@@
diff -Nur linux-2.6.17/arch/mips/aruba/Makefile linux-2.6.17-owrt/arch/mips/arub
+# .S.o:
+# $(CC) $(CFLAGS) -c $< -o $*.o
+
+# .S.o:
+# $(CC) $(CFLAGS) -c $< -o $*.o
+
-+obj-y := prom.o setup.o i
dtIRQ.o i
rq.o time.o flash_lock.o
++obj-y := prom.o setup.o irq.o time.o flash_lock.o
+obj-$(CONFIG_SERIAL_8250) += serial.o
+
+subdir-y += nvram
+obj-$(CONFIG_SERIAL_8250) += serial.o
+
+subdir-y += nvram
@@
-921,7
+921,7
@@
diff -Nur linux-2.6.17/arch/mips/aruba/setup.c linux-2.6.17-owrt/arch/mips/aruba
diff -Nur linux-2.6.17/arch/mips/aruba/time.c linux-2.6.17-owrt/arch/mips/aruba/time.c
--- linux-2.6.17/arch/mips/aruba/time.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.17-owrt/arch/mips/aruba/time.c 2006-06-18 12:44:28.000000000 +0200
diff -Nur linux-2.6.17/arch/mips/aruba/time.c linux-2.6.17-owrt/arch/mips/aruba/time.c
--- linux-2.6.17/arch/mips/aruba/time.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.17-owrt/arch/mips/aruba/time.c 2006-06-18 12:44:28.000000000 +0200
-@@ -0,0 +1,1
08
@@
+@@ -0,0 +1,1
10
@@
+/**************************************************************************
+ *
+ * BRIEF MODULE DESCRIPTION
+/**************************************************************************
+ *
+ * BRIEF MODULE DESCRIPTION
@@
-1022,8
+1022,10
@@
diff -Nur linux-2.6.17/arch/mips/aruba/time.c linux-2.6.17-owrt/arch/mips/aruba/
+
+}
+
+
+}
+
-+asmlinkage void aruba_timer_interrupt(
int irq,
struct pt_regs *regs)
++asmlinkage void aruba_timer_interrupt(struct pt_regs *regs)
+{
+{
++ int irq = MIPS_CPU_TIMER_IRQ;
++
+ irq_enter();
+ kstat_this_cpu.irqs[irq]++;
+
+ irq_enter();
+ kstat_this_cpu.irqs[irq]++;
+
@@
-1200,7
+1202,7
@@
diff -Nur linux-2.6.17/drivers/net/natsemi.c linux-2.6.17-owrt/drivers/net/natse
diff -Nur linux-2.6.17/drivers/net/rc32434_eth.c linux-2.6.17-owrt/drivers/net/rc32434_eth.c
--- linux-2.6.17/drivers/net/rc32434_eth.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.17-owrt/drivers/net/rc32434_eth.c 2006-06-18 12:44:28.000000000 +0200
diff -Nur linux-2.6.17/drivers/net/rc32434_eth.c linux-2.6.17-owrt/drivers/net/rc32434_eth.c
--- linux-2.6.17/drivers/net/rc32434_eth.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.17-owrt/drivers/net/rc32434_eth.c 2006-06-18 12:44:28.000000000 +0200
-@@ -0,0 +1,12
68
@@
+@@ -0,0 +1,12
73
@@
+/**************************************************************************
+ *
+ * BRIEF MODULE DESCRIPTION
+/**************************************************************************
+ *
+ * BRIEF MODULE DESCRIPTION
@@
-1242,6
+1244,7
@@
diff -Nur linux-2.6.17/drivers/net/rc32434_eth.c linux-2.6.17-owrt/drivers/net/r
+ */
+
+#include <linux/config.h>
+ */
+
+#include <linux/config.h>
++#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/moduleparam.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/moduleparam.h>
@@
-1287,7
+1290,11
@@
diff -Nur linux-2.6.17/drivers/net/rc32434_eth.c linux-2.6.17-owrt/drivers/net/r
+#define MII_CLOCK 1250000 /* no more than 2.5MHz */
+static char mac0[18] = "08:00:06:05:40:01";
+
+#define MII_CLOCK 1250000 /* no more than 2.5MHz */
+static char mac0[18] = "08:00:06:05:40:01";
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,52)
++module_param_string(mac0, mac0, 18, 0);
++#else
+MODULE_PARM(mac0, "c18");
+MODULE_PARM(mac0, "c18");
++#endif
+MODULE_PARM_DESC(mac0, "MAC address for RC32434 ethernet0");
+
+static struct rc32434_if_t {
+MODULE_PARM_DESC(mac0, "MAC address for RC32434 ethernet0");
+
+static struct rc32434_if_t {
This page took
0.022399 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff