diff options
| author | Jan Kara <jack@suse.cz> | 2008-06-24 05:43:00 -0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2008-06-24 05:43:00 -0400 |
| commit | 19fd426a18b48a0446ba4b54ac66264916dcb7f3 (patch) | |
| tree | b9e0f2bc35e746c14f5e5e5519ed79f1eb4b0f98 /include/asm-mips/mach-au1x00 | |
| parent | e8183c2452041326c95258ecc7865b6fcd91c730 (diff) | |
| parent | 62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (diff) | |
Merge branch 'master' into for_mm
Diffstat (limited to 'include/asm-mips/mach-au1x00')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 1b5064dac007..0d302bad4492 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
| @@ -615,6 +615,7 @@ enum soc_au1500_ints { | |||
| 615 | AU1000_RTC_MATCH1_INT, | 615 | AU1000_RTC_MATCH1_INT, |
| 616 | AU1000_RTC_MATCH2_INT, | 616 | AU1000_RTC_MATCH2_INT, |
| 617 | AU1500_PCI_ERR_INT, | 617 | AU1500_PCI_ERR_INT, |
| 618 | AU1500_RESERVED_INT, | ||
| 618 | AU1000_USB_DEV_REQ_INT, | 619 | AU1000_USB_DEV_REQ_INT, |
| 619 | AU1000_USB_DEV_SUS_INT, | 620 | AU1000_USB_DEV_SUS_INT, |
| 620 | AU1000_USB_HOST_INT, | 621 | AU1000_USB_HOST_INT, |