diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-04-02 02:33:15 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-04-03 22:26:34 -0400 |
commit | 8a28b10e915fff4a4e8be4f152a8e8695d0cb044 (patch) | |
tree | 3fafe8392d50c8530327df99283212441dc3c6fa /arch/arm/mach-pxa/colibri-pxa300.c | |
parent | 22a0200b18b8526043d3014efdaf839b01767111 (diff) |
[ARM] pxa/colibri: get rid of set_irq_type()
In commit 47cb035560a41bd1bd3db506eeab93088815203e, the ax88796 driver
learned to take IRQ flags from platform_device definition. Use that here
to get rid of the set_irq_type() hack.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa300.c')
-rw-r--r-- | arch/arm/mach-pxa/colibri-pxa300.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index 0964eda4dcf4..7c9c34c19ae2 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
17 | #include <linux/gpio.h> | 17 | #include <linux/gpio.h> |
18 | #include <net/ax88796.h> | 18 | #include <linux/interrupt.h> |
19 | 19 | ||
20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
21 | #include <asm/sizes.h> | 21 | #include <asm/sizes.h> |
@@ -50,7 +50,7 @@ static struct resource colibri_asix_resource[] = { | |||
50 | [1] = { | 50 | [1] = { |
51 | .start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), | 51 | .start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), |
52 | .end = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), | 52 | .end = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), |
53 | .flags = IORESOURCE_IRQ | 53 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING, |
54 | } | 54 | } |
55 | }; | 55 | }; |
56 | 56 | ||
@@ -73,7 +73,6 @@ static void __init colibri_pxa300_init_eth(void) | |||
73 | { | 73 | { |
74 | colibri_pxa3xx_init_eth(&colibri_asix_platdata); | 74 | colibri_pxa3xx_init_eth(&colibri_asix_platdata); |
75 | pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_eth_pin_config)); | 75 | pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_eth_pin_config)); |
76 | set_irq_type(gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), IRQ_TYPE_EDGE_FALLING); | ||
77 | platform_device_register(&asix_device); | 76 | platform_device_register(&asix_device); |
78 | } | 77 | } |
79 | #else | 78 | #else |