+ case MACH_ARUBA_AP60:
+ default:
+ #define MERLOT_WLAN1_IRQ 2 // bit 10 in CP0_status register
+ 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
+
+ #define MERLOT_WLAN_IRQ 5 // bit 13 in CP0_status register
+ #define MERLOT_MISC_IRQ 6 // bit 14 in CP0_status register = GROUP 0
+