[Armadeus-commitlog] SF.net SVN: armadeus: [756] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff

[<th...@us...>]

Revision: 756
          http://armadeus.svn.sourceforge.net/armadeus/?rev=756&view=rev
Author:   thom25
Date:     2008-01-23 06:25:36 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
clean up hunk

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff	2008-01-22 21:06:27 UTC (rev 755)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/041-linux-2.6.23.1-imx_irq.diff	2008-01-23 14:25:36 UTC (rev 756)
@@ -1,22 +1,24 @@
 --- linux-org/arch/arm/mach-imx/irq.c	2006-09-20 05:42:06.000000000 +0200
 +++ linux-imx/arch/arm/mach-imx/irq.c	2006-12-09 17:37:53.386928000 +0100
-@@ -67,6 +67,12 @@ imx_unmask_irq(unsigned int irq)
- {
- 	__raw_writel(irq, IMX_AITC_INTENNUM);
- }
-+
-+static int
-+imx_irq_type(unsigned int _irq, unsigned int type)
-+{
-+    return 0;
-+}
+@@ -69,6 +69,12 @@ imx_unmask_irq(unsigned int irq)
+ }
+ 
+ static int
++imx_irq_type(unsigned int _irq, unsigned int type)
++{
++    return 0;
++}
++
++static int
+ imx_gpio_irq_type(unsigned int _irq, unsigned int type)
+ {
+ 	unsigned int irq_type = 0, irq, reg, bit;
+@@ -205,6 +211,7 @@ static struct irq_chip imx_internal_chip
+ 	.ack = imx_mask_irq,
+ 	.mask = imx_mask_irq,
+ 	.unmask = imx_unmask_irq,
++	.set_type = imx_irq_type,
+ };
+ 
+ static struct irq_chip imx_gpio_chip = {
  
- static int
- imx_gpio_irq_type(unsigned int _irq, unsigned int type)
-@@ -209,6 +215,7 @@ static struct irq_chip imx_internal_chip
- 	.ack = imx_mask_irq,
- 	.mask = imx_mask_irq,
- 	.unmask = imx_unmask_irq,
-+	.set_type = imx_irq_type,
- };
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.