diff --git a/[refs] b/[refs]
index 92fcfaa06cdd..abe23fa63cd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2839cc1e7e1f260afc5cf9fb6be5b6c3e9d85fea
+refs/heads/master: 2d21237e38120c2dfbc047b39aa2a56df67bdeec
diff --git a/trunk/arch/arm/mach-s3c64xx/include/mach/irqs.h b/trunk/arch/arm/mach-s3c64xx/include/mach/irqs.h
index 8e2df26cf14a..bf7cc82ea6d0 100644
--- a/trunk/arch/arm/mach-s3c64xx/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-s3c64xx/include/mach/irqs.h
@@ -215,6 +215,7 @@
 /* Compatibility */
 
 #define IRQ_ONENAND	IRQ_ONENAND0
+#define IRQ_I2S0	IRQ_S3C6410_IIS
 
 #endif /* __ASM_MACH_S3C64XX_IRQS_H */
 
diff --git a/trunk/arch/arm/mach-s5p64x0/include/mach/irqs.h b/trunk/arch/arm/mach-s5p64x0/include/mach/irqs.h
index 513abffc7604..5837a36ece8d 100644
--- a/trunk/arch/arm/mach-s5p64x0/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-s5p64x0/include/mach/irqs.h
@@ -85,6 +85,8 @@
 #define IRQ_S3CUART_RX4		IRQ_S5P_UART_RX4
 #define IRQ_S3CUART_RX5		IRQ_S5P_UART_RX5
 
+#define IRQ_I2S0		IRQ_I2SV40
+
 /* S5P6450 EINT feature will be added */
 
 /*
diff --git a/trunk/arch/arm/mach-s5pv210/dev-audio.c b/trunk/arch/arm/mach-s5pv210/dev-audio.c
index 0be95f1ea2fe..63f5d82004b5 100644
--- a/trunk/arch/arm/mach-s5pv210/dev-audio.c
+++ b/trunk/arch/arm/mach-s5pv210/dev-audio.c
@@ -18,6 +18,7 @@
 #include <mach/map.h>
 #include <mach/dma.h>
 #include <mach/irqs.h>
+#include <mach/regs-audss.h>
 
 static const char *rclksrc[] = {
 	[0] = "busclk",