---

yaml --- r: 339759 b: refs/heads/master c: 1e66210 h: refs/heads/master i: 339757: a3e82b7 339755: 1801a7c 339751: ebbbd83 339743: c50e567 v: v3
git-mirror · Oct 15, 2012 · 7836aff · 7836aff
1 parent 193ea83
commit 7836aff
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50f2de61269bbe2f40bead1969a9594fa8599b93
+refs/heads/master: 1e66210a3135b544713a9455e78e36f6f8d1bf77
diff --git a/trunk/arch/arm/mach-imx/avic.c b/trunk/arch/arm/mach-imx/avic.c
@@ -24,7 +24,6 @@
 #include <linux/of.h>
 #include <asm/mach/irq.h>
 #include <asm/exception.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 #include "hardware.h"

diff --git a/trunk/arch/arm/mach-imx/include/mach/irqs.h b/trunk/arch/arm/mach-imx/include/mach/irqs.h
diff --git a/trunk/arch/arm/mach-imx/irq-common.h b/trunk/arch/arm/mach-imx/irq-common.h
@@ -19,6 +19,9 @@
 #ifndef __PLAT_MXC_IRQ_COMMON_H__
 #define __PLAT_MXC_IRQ_COMMON_H__
 
+/* all normal IRQs can be FIQs */
+#define FIQ_START	0
+
 struct mxc_extra_irq
 {
 	int (*set_priority)(unsigned char irq, unsigned char prio);

diff --git a/trunk/arch/arm/mach-imx/tzic.c b/trunk/arch/arm/mach-imx/tzic.c
@@ -21,8 +21,6 @@
 #include <asm/mach/irq.h>
 #include <asm/exception.h>
 
-#include <mach/irqs.h>
-
 #include "common.h"
 #include "hardware.h"
 #include "irq-common.h"

diff --git a/trunk/include/linux/platform_data/asoc-imx-ssi.h b/trunk/include/linux/platform_data/asoc-imx-ssi.h
@@ -17,5 +17,7 @@ struct imx_ssi_platform_data {
 	void (*ac97_warm_reset)(struct snd_ac97 *ac97);
 };
 
+extern int mxc_set_irq_fiq(unsigned int irq, unsigned int type);
+
 #endif /* __MACH_SSI_H */
 
diff --git a/trunk/sound/soc/fsl/imx-pcm-fiq.c b/trunk/sound/soc/fsl/imx-pcm-fiq.c
@@ -29,7 +29,6 @@
 
 #include <asm/fiq.h>
 
-#include <mach/irqs.h>
 #include <linux/platform_data/asoc-imx-ssi.h>
 
 #include "imx-ssi.h"