Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / asm-arm / arch-lh7a40x / irqs.h

diff --git a/include/asm-arm/arch-lh7a40x/irqs.h b/include/asm-arm/arch-lh7a40x/irqs.h
index 189908b2b79ab1d0b1111902e8b4e5c67b209e00..afe8c7cbad6a181d552550cab3c00c47d302ade7 100644 (file)
--- a/include/asm-arm/arch-lh7a40x/irqs.h
+++ b/include/asm-arm/arch-lh7a40x/irqs.h
@@ -153,9 +153,10 @@
 #if !defined (IRQ_GPIO0INTR)
 # define IRQ_GPIO0INTR IRQ_GPIO0FIQ
 #endif
-#define IRQ_TICK       IRQ_TINTR
+#define IRQ_TICK       IRQ_TINTR
 #define IRQ_PCC1_RDY   IRQ_GPIO6INTR   /* PCCard 1 ready */
 #define IRQ_PCC2_RDY   IRQ_GPIO7INTR   /* PCCard 2 ready */
+#define IRQ_USB                IRQ_USBINTR     /* USB device */
 
 #ifdef CONFIG_MACH_KEV7A400
 # define IRQ_TS                IRQ_GPIOFIQ     /* Touchscreen */
@@ -190,6 +191,10 @@
 # define IRQ_LPD7A400_TS       IRQ_LPD7A40X_CPLD + 1   /* Touch screen */
 #endif
 
+#if defined (CONFIG_MACH_LPD7A400)
+# define IRQ_TOUCH             IRQ_LPD7A400_TS
+#endif
+
 #define NR_IRQS                (NR_IRQ_CPU + NR_IRQ_BOARD)
 
 #endif