add ethernet driver for ap60/61

[openwrt-10.03/.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 5daab5688b7c98497275a4e5e419c1c52bb33d38..ce9cf2289f79f8e025248137d257261fe1f571e7 100644 (file)
--- a/target/linux/aruba-2.6/patches/000-aruba.patch
+++ b/target/linux/aruba-2.6/patches/000-aruba.patch
@@ -487,7 +487,7 @@ diff -Nur linux-2.6.15/arch/mips/aruba/irq.c linux-2.6.15-openwrt/arch/mips/arub
 +              case MACH_ARUBA_AP60:
 +              default:
 +                      #define MERLOT_WLAN1_IRQ   2    // bit 10 in CP0_status register
-+                      #define MERLOT_ENET_IRQ    3    // bit 11 in CP0_status register
++                      #define MERLOT_ENET_IRQ    4    // bit 11 in CP0_status register
 +                      #define MERLOT_WLAN_IRQ    5    // bit 13 in CP0_status register
 +                      #define MERLOT_MISC_IRQ    6    // bit 14 in CP0_status register = GROUP 0
 +      
@@ -3873,7 +3873,7 @@ diff -Nur linux-2.6.15/drivers/pci/access.c linux-2.6.15-openwrt/drivers/pci/acc
 diff -Nur linux-2.6.15/include/asm-mips/bootinfo.h linux-2.6.15-openwrt/include/asm-mips/bootinfo.h
 --- linux-2.6.15/include/asm-mips/bootinfo.h   2006-01-03 04:21:10.000000000 +0100
 +++ linux-2.6.15-openwrt/include/asm-mips/bootinfo.h   2006-01-10 00:32:33.000000000 +0100
-@@ -218,6 +218,16 @@
+@@ -218,6 +218,17 @@
  #define MACH_GROUP_TITAN       22     /* PMC-Sierra Titan             */
  #define  MACH_TITAN_YOSEMITE  1       /* PMC-Sierra Yosemite          */
  
@@ -3886,6 +3886,7 @@ diff -Nur linux-2.6.15/include/asm-mips/bootinfo.h linux-2.6.15-openwrt/include/
 +#define  MACH_ARUBA_AP60      1
 +#define  MACH_ARUBA_AP65      2
 +#define  MACH_ARUBA_AP70      3
++#define  MACH_ARUBA_AP40      4
 +
  #define CL_SIZE                       COMMAND_LINE_SIZE