diff options
author | Rod Whitby <rod@whitby.id.au> | 2005-11-11 02:56:05 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-11 02:56:05 +0000 |
commit | a98a49816bcbad04b23db4ab641fe066503732ce (patch) | |
tree | a69ef171a6078056a27f37bfa14611cee9c5b23a /packages/linux/nas100d-kernel/2.6.14/nas100d-power.c | |
parent | 458c86c63b009dff60a5eeb1ecb5711c93696cdc (diff) | |
parent | 6059496f64b860b42e3ea2f99eeaa9a23920a4c2 (diff) |
merge of 0cbb13c94d1d354d5287fb1b304b348fa2003d0c
and a21672eaa3285e42fbfeefbb8e1bd68923c357e9
Diffstat (limited to 'packages/linux/nas100d-kernel/2.6.14/nas100d-power.c')
-rw-r--r-- | packages/linux/nas100d-kernel/2.6.14/nas100d-power.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/linux/nas100d-kernel/2.6.14/nas100d-power.c b/packages/linux/nas100d-kernel/2.6.14/nas100d-power.c index 008e6d5490..94ce5d1b46 100644 --- a/packages/linux/nas100d-kernel/2.6.14/nas100d-power.c +++ b/packages/linux/nas100d-kernel/2.6.14/nas100d-power.c @@ -49,13 +49,13 @@ static int __init nas100d_power_init(void) if (!(machine_is_nas100d())) return 0; - *IXP4XX_GPIO_GPISR = 0x20400000; /* read the 2 irqs to clr */ + // *IXP4XX_GPIO_GPISR = 0x20400000; /* read the 2 irqs to clr */ set_irq_type(NAS100D_RB_IRQ, IRQT_LOW); - set_irq_type(NAS100D_PB_IRQ, IRQT_HIGH); +// set_irq_type(NAS100D_PB_IRQ, IRQT_HIGH); gpio_line_isr_clear(NAS100D_RB_GPIO); - gpio_line_isr_clear(NAS100D_PB_GPIO); +// gpio_line_isr_clear(NAS100D_PB_GPIO); if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler, SA_INTERRUPT, "NAS100D reset button", NULL) < 0) { @@ -65,7 +65,7 @@ static int __init nas100d_power_init(void) return -EIO; } - +/* if (request_irq(NAS100D_PB_IRQ, &nas100d_power_handler, SA_INTERRUPT, "NAS100D power button", NULL) < 0) { @@ -74,14 +74,14 @@ static int __init nas100d_power_init(void) return -EIO; } - +*/ return 0; } static void __exit nas100d_power_exit(void) { free_irq(NAS100D_RB_IRQ, NULL); - free_irq(NAS100D_PB_IRQ, NULL); +// free_irq(NAS100D_PB_IRQ, NULL); } module_init(nas100d_power_init); |