Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

[linux-2.6] / include / asm-mips / mach-au1x00 / au1000.h

diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h
index 363a14ee0ae5d2718435e5db2c57432a684075f6..0d302bad44922f3831a2d7064b7bea39da3061f1 100644 (file)
--- a/include/asm-mips/mach-au1x00/au1000.h
+++ b/include/asm-mips/mach-au1x00/au1000.h
@@ -615,6 +615,7 @@ enum soc_au1500_ints {
        AU1000_RTC_MATCH1_INT,
        AU1000_RTC_MATCH2_INT,
        AU1500_PCI_ERR_INT,
+       AU1500_RESERVED_INT,
        AU1000_USB_DEV_REQ_INT,
        AU1000_USB_DEV_SUS_INT,
        AU1000_USB_HOST_INT,
@@ -1036,7 +1037,7 @@ enum soc_au1200_ints {
 #define USBD_INTSTAT           0xB020001C
 #  define USBDEV_INT_SOF       (1 << 12)
 #  define USBDEV_INT_HF_BIT    6
-#  define USBDEV_INT_HF_MASK   0x3f << USBDEV_INT_HF_BIT)
+#  define USBDEV_INT_HF_MASK   (0x3f << USBDEV_INT_HF_BIT)
 #  define USBDEV_INT_CMPLT_BIT 0
 #  define USBDEV_INT_CMPLT_MASK (0x3f << USBDEV_INT_CMPLT_BIT)
 #define USBD_CONFIG            0xB0200020